diff --git a/docs/android-examples/android-sdk/ApiDemos/.classpath b/docs/android-examples/android-sdk/ApiDemos/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/ApiDemos/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/ApiDemos/.project b/docs/android-examples/android-sdk/ApiDemos/.project
new file mode 100644
index 000000000..9bc9d6f66
--- /dev/null
+++ b/docs/android-examples/android-sdk/ApiDemos/.project
@@ -0,0 +1,41 @@
+
+
+ ApiDemos
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/ContactManager/.classpath b/docs/android-examples/android-sdk/ContactManager/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/ContactManager/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/ContactManager/.project b/docs/android-examples/android-sdk/ContactManager/.project
new file mode 100644
index 000000000..1b80e3472
--- /dev/null
+++ b/docs/android-examples/android-sdk/ContactManager/.project
@@ -0,0 +1,41 @@
+
+
+ ContactManager
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/CubeLiveWallpaper/.classpath b/docs/android-examples/android-sdk/CubeLiveWallpaper/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/CubeLiveWallpaper/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/CubeLiveWallpaper/.project b/docs/android-examples/android-sdk/CubeLiveWallpaper/.project
new file mode 100644
index 000000000..6c273722d
--- /dev/null
+++ b/docs/android-examples/android-sdk/CubeLiveWallpaper/.project
@@ -0,0 +1,41 @@
+
+
+ CubeLiveWallpaper
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/FileBrowser/.classpath b/docs/android-examples/android-sdk/FileBrowser/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/FileBrowser/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/FileBrowser/.project b/docs/android-examples/android-sdk/FileBrowser/.project
new file mode 100644
index 000000000..824f4acc9
--- /dev/null
+++ b/docs/android-examples/android-sdk/FileBrowser/.project
@@ -0,0 +1,41 @@
+
+
+ FileBrowser
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/GestureBuilder/.classpath b/docs/android-examples/android-sdk/GestureBuilder/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/GestureBuilder/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/GestureBuilder/.project b/docs/android-examples/android-sdk/GestureBuilder/.project
new file mode 100644
index 000000000..eb7d8d202
--- /dev/null
+++ b/docs/android-examples/android-sdk/GestureBuilder/.project
@@ -0,0 +1,41 @@
+
+
+ GestureBuilder
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/HelloActivity/.classpath b/docs/android-examples/android-sdk/HelloActivity/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/HelloActivity/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/HelloActivity/.project b/docs/android-examples/android-sdk/HelloActivity/.project
new file mode 100644
index 000000000..e64dc8c85
--- /dev/null
+++ b/docs/android-examples/android-sdk/HelloActivity/.project
@@ -0,0 +1,41 @@
+
+
+ HelloActivity
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/Home/.classpath b/docs/android-examples/android-sdk/Home/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/Home/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/Home/.project b/docs/android-examples/android-sdk/Home/.project
new file mode 100644
index 000000000..0ab91ff0b
--- /dev/null
+++ b/docs/android-examples/android-sdk/Home/.project
@@ -0,0 +1,41 @@
+
+
+ Home
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/JetBoy/.classpath b/docs/android-examples/android-sdk/JetBoy/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/JetBoy/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/JetBoy/.project b/docs/android-examples/android-sdk/JetBoy/.project
new file mode 100644
index 000000000..9e64c650e
--- /dev/null
+++ b/docs/android-examples/android-sdk/JetBoy/.project
@@ -0,0 +1,41 @@
+
+
+ JetBoy
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/LunarLander/.classpath b/docs/android-examples/android-sdk/LunarLander/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/LunarLander/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/LunarLander/.project b/docs/android-examples/android-sdk/LunarLander/.project
new file mode 100644
index 000000000..98bce22b3
--- /dev/null
+++ b/docs/android-examples/android-sdk/LunarLander/.project
@@ -0,0 +1,41 @@
+
+
+ LunarLander
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/MapsDemo/.classpath b/docs/android-examples/android-sdk/MapsDemo/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/MapsDemo/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/MapsDemo/.project b/docs/android-examples/android-sdk/MapsDemo/.project
new file mode 100644
index 000000000..549d3c620
--- /dev/null
+++ b/docs/android-examples/android-sdk/MapsDemo/.project
@@ -0,0 +1,41 @@
+
+
+ MapsDemo
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/NotePad/.classpath b/docs/android-examples/android-sdk/NotePad/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/NotePad/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/NotePad/.project b/docs/android-examples/android-sdk/NotePad/.project
new file mode 100644
index 000000000..1f7505ce0
--- /dev/null
+++ b/docs/android-examples/android-sdk/NotePad/.project
@@ -0,0 +1,41 @@
+
+
+ NotePad
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/PhoneDialer/.classpath b/docs/android-examples/android-sdk/PhoneDialer/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/PhoneDialer/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/PhoneDialer/.project b/docs/android-examples/android-sdk/PhoneDialer/.project
new file mode 100644
index 000000000..a56cbfad5
--- /dev/null
+++ b/docs/android-examples/android-sdk/PhoneDialer/.project
@@ -0,0 +1,41 @@
+
+
+ PhoneDialer
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/README.txt b/docs/android-examples/android-sdk/README.txt
index ec0acb97f..9c67b0b19 100644
--- a/docs/android-examples/android-sdk/README.txt
+++ b/docs/android-examples/android-sdk/README.txt
@@ -35,11 +35,11 @@ In order to build/run our Android examples we need to install the following
free software distributions (tested versions and download sites are given in
parenthesis) :
-1) Sun Java SDK 1.6 or newer (1.6.0_20 , www.sun.com/java/jdk/)
-2) Scala SDK 2.7.5 or newer (2.8.0_RC7, www.scala-lang.org/downloads/)
-3) Android SDK 1.5 or newer (2.2 , developer.android.com/sdk/)
-4) Apache Ant 1.7.0 or newer (1.8.1 , ant.apache.org/)
-5) ProGuard 4.4 or newer (4.5 , www.proguard.com/)
+1) Sun Java SDK 1.6 or newer (1.6.0_21 , www.sun.com/java/jdk/)
+2) Scala SDK 2.7.5 or newer (2.8.0.final, www.scala-lang.org/downloads/)
+3) Android SDK 1.5 or newer (2.2 , developer.android.com/sdk/)
+4) Apache Ant 1.7.0 or newer (1.8.1 , ant.apache.org/)
+5) ProGuard 4.4 or newer (4.5.1 , www.proguard.com/)
NB. In this document we rely on Ant tasks featured by the Scala SDK, the
Android SDK and the ProGuard shrinker and obfuscator tool (we will say more
@@ -183,8 +183,8 @@ bytecode. Concretely, we have two choices :
(1) Sizes of application packages include bytecode and resources.
(2) Elapsed times for Scala builds include ProGuard processing time.
- NB. The above results were measured with ProGuard 4.5 on a 2.0 GHz
- Pentium M with 2 GB of memory, using Sun JDK 1.6.0_20 and Scala 2.8.0_RC7
+ NB. The above results were measured with ProGuard 4.5.1 on a 2.0 GHz
+ Pentium M with 2 GB of memory, using Sun JDK 1.6.0_21 and Scala 2.8.0.final
on Ubuntu 8.04 Linux.
diff --git a/docs/android-examples/android-sdk/SearchableDictionary/.classpath b/docs/android-examples/android-sdk/SearchableDictionary/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/SearchableDictionary/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/SearchableDictionary/.project b/docs/android-examples/android-sdk/SearchableDictionary/.project
new file mode 100644
index 000000000..3a575e8af
--- /dev/null
+++ b/docs/android-examples/android-sdk/SearchableDictionary/.project
@@ -0,0 +1,41 @@
+
+
+ SearchableDictionary
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/Snake/.classpath b/docs/android-examples/android-sdk/Snake/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/Snake/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/Snake/.project b/docs/android-examples/android-sdk/Snake/.project
new file mode 100644
index 000000000..3ff3e4d5c
--- /dev/null
+++ b/docs/android-examples/android-sdk/Snake/.project
@@ -0,0 +1,41 @@
+
+
+ Snake
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/Wiktionary/.classpath b/docs/android-examples/android-sdk/Wiktionary/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/android-sdk/Wiktionary/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/android-sdk/Wiktionary/.project b/docs/android-examples/android-sdk/Wiktionary/.project
new file mode 100644
index 000000000..a0507b709
--- /dev/null
+++ b/docs/android-examples/android-sdk/Wiktionary/.project
@@ -0,0 +1,41 @@
+
+
+ Wiktionary
+
+ Android SDK (http://developer.android.com/sdk/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/android-sdk/build.xml b/docs/android-examples/android-sdk/build.xml
index 24eb01c3f..bd58ccfdb 100644
--- a/docs/android-examples/android-sdk/build.xml
+++ b/docs/android-examples/android-sdk/build.xml
@@ -21,7 +21,7 @@ Builds the Scala applications targeted to the Android platform.
+ excludes=".metadata,bin,configs,MapsDemo,Wiktionary" />
diff --git a/docs/android-examples/apps-for-android/Downloader/.classpath b/docs/android-examples/apps-for-android/Downloader/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/apps-for-android/Downloader/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/apps-for-android/Downloader/.project b/docs/android-examples/apps-for-android/Downloader/.project
new file mode 100644
index 000000000..15f4f3d9b
--- /dev/null
+++ b/docs/android-examples/apps-for-android/Downloader/.project
@@ -0,0 +1,41 @@
+
+
+ Downloader
+
+ apps-for-android project (http://code.google.com/p/apps-for-android/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/apps-for-android/README.txt b/docs/android-examples/apps-for-android/README.txt
index bfd7af160..d0a5fa8c2 100644
--- a/docs/android-examples/apps-for-android/README.txt
+++ b/docs/android-examples/apps-for-android/README.txt
@@ -35,11 +35,11 @@ In order to build/run our Android examples we need to install the following
free software distributions (tested versions and download sites are given in
parenthesis) :
-1) Sun Java SDK 1.6 or newer (1.6.0_20 , www.sun.com/java/jdk/)
-2) Scala SDK 2.7.5 or newer (2.8.0_RC7, www.scala-lang.org/downloads/)
-3) Android SDK 1.5 or newer (2.2 , developer.android.com/sdk/)
-4) Apache Ant 1.7.0 or newer (1.8.1 , ant.apache.org/)
-5) ProGuard 4.4 or newer (4.5 , www.proguard.com/)
+1) Sun Java SDK 1.6 or newer (1.6.0_21 , www.sun.com/java/jdk/)
+2) Scala SDK 2.7.5 or newer (2.8.0.final, www.scala-lang.org/downloads/)
+3) Android SDK 1.5 or newer (2.2 , developer.android.com/sdk/)
+4) Apache Ant 1.7.0 or newer (1.8.1 , ant.apache.org/)
+5) ProGuard 4.4 or newer (4.5.1 , www.proguard.com/)
NB. In this document we rely on Ant tasks featured by the Scala SDK, the
Android SDK and the ProGuard shrinker and obfuscator tool (we will say more
diff --git a/docs/android-examples/apps-for-android/Translate/.classpath b/docs/android-examples/apps-for-android/Translate/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/apps-for-android/Translate/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/apps-for-android/Translate/.project b/docs/android-examples/apps-for-android/Translate/.project
new file mode 100644
index 000000000..21106ae5e
--- /dev/null
+++ b/docs/android-examples/apps-for-android/Translate/.project
@@ -0,0 +1,41 @@
+
+
+ Translate
+
+ apps-for-android project (http://code.google.com/p/apps-for-android/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/apps-for-android/Triangle/.classpath b/docs/android-examples/apps-for-android/Triangle/.classpath
new file mode 100644
index 000000000..30ec82080
--- /dev/null
+++ b/docs/android-examples/apps-for-android/Triangle/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/docs/android-examples/apps-for-android/Triangle/.project b/docs/android-examples/apps-for-android/Triangle/.project
new file mode 100644
index 000000000..a592d5388
--- /dev/null
+++ b/docs/android-examples/apps-for-android/Triangle/.project
@@ -0,0 +1,41 @@
+
+
+ Triangle
+
+ apps-for-android project (http://code.google.com/p/apps-for-android/)
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
+
+
diff --git a/docs/android-examples/apps-for-android/build.xml b/docs/android-examples/apps-for-android/build.xml
index 9a3e3992c..e3ee69aec 100644
--- a/docs/android-examples/apps-for-android/build.xml
+++ b/docs/android-examples/apps-for-android/build.xml
@@ -19,7 +19,8 @@ Builds the Scala applications targeted to the Android platform.
-
+
diff --git a/docs/android-examples/unlocking-android/AWhereDoYouLive/.classpath b/docs/android-examples/unlocking-android/AWhereDoYouLive/.classpath
index 9a5c3f185..30ec82080 100644
--- a/docs/android-examples/unlocking-android/AWhereDoYouLive/.classpath
+++ b/docs/android-examples/unlocking-android/AWhereDoYouLive/.classpath
@@ -1,6 +1,8 @@
-
+
+
+
diff --git a/docs/android-examples/unlocking-android/AWhereDoYouLive/.project b/docs/android-examples/unlocking-android/AWhereDoYouLive/.project
index 9e3384ea5..9b097b682 100644
--- a/docs/android-examples/unlocking-android/AWhereDoYouLive/.project
+++ b/docs/android-examples/unlocking-android/AWhereDoYouLive/.project
@@ -1,7 +1,9 @@
- AndroidChapter1Example
-
+ AWhereDoYouLive
+
+ Unlocking Android book (http://code.google.com/p/unlocking-android/)
+
@@ -20,6 +22,11 @@
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
com.android.ide.eclipse.adt.ApkBuilder
@@ -29,5 +36,6 @@
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
diff --git a/docs/android-examples/unlocking-android/BounceyBall/.classpath b/docs/android-examples/unlocking-android/BounceyBall/.classpath
index ef7c361cf..30ec82080 100644
--- a/docs/android-examples/unlocking-android/BounceyBall/.classpath
+++ b/docs/android-examples/unlocking-android/BounceyBall/.classpath
@@ -1,6 +1,8 @@
+
+
diff --git a/docs/android-examples/unlocking-android/BounceyBall/.project b/docs/android-examples/unlocking-android/BounceyBall/.project
index f49039cdf..283cf1c47 100644
--- a/docs/android-examples/unlocking-android/BounceyBall/.project
+++ b/docs/android-examples/unlocking-android/BounceyBall/.project
@@ -1,7 +1,9 @@
- uad-BounceyBall
-
+ BounceyBall
+
+ Unlocking Android book (http://code.google.com/p/unlocking-android/)
+
@@ -20,6 +22,11 @@
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
com.android.ide.eclipse.adt.ApkBuilder
@@ -29,5 +36,6 @@
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
diff --git a/docs/android-examples/unlocking-android/ChapterTwo/.classpath b/docs/android-examples/unlocking-android/ChapterTwo/.classpath
index 9a5c3f185..30ec82080 100644
--- a/docs/android-examples/unlocking-android/ChapterTwo/.classpath
+++ b/docs/android-examples/unlocking-android/ChapterTwo/.classpath
@@ -1,6 +1,8 @@
-
+
+
+
diff --git a/docs/android-examples/unlocking-android/FileStorage/.classpath b/docs/android-examples/unlocking-android/FileStorage/.classpath
index ef7c361cf..30ec82080 100644
--- a/docs/android-examples/unlocking-android/FileStorage/.classpath
+++ b/docs/android-examples/unlocking-android/FileStorage/.classpath
@@ -1,6 +1,8 @@
+
+
diff --git a/docs/android-examples/unlocking-android/FileStorage/.project b/docs/android-examples/unlocking-android/FileStorage/.project
index 1bf8de715..f730791ae 100644
--- a/docs/android-examples/unlocking-android/FileStorage/.project
+++ b/docs/android-examples/unlocking-android/FileStorage/.project
@@ -1,7 +1,9 @@
- uad-FileStorage
-
+ FileStorage
+
+ Unlocking Android book (http://code.google.com/p/unlocking-android/)
+
@@ -20,6 +22,11 @@
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
com.android.ide.eclipse.adt.ApkBuilder
@@ -29,5 +36,6 @@
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
diff --git a/docs/android-examples/unlocking-android/GeocodeExample/.classpath b/docs/android-examples/unlocking-android/GeocodeExample/.classpath
index ef7c361cf..30ec82080 100644
--- a/docs/android-examples/unlocking-android/GeocodeExample/.classpath
+++ b/docs/android-examples/unlocking-android/GeocodeExample/.classpath
@@ -1,6 +1,8 @@
+
+
diff --git a/docs/android-examples/unlocking-android/GeocodeExample/.project b/docs/android-examples/unlocking-android/GeocodeExample/.project
index 2f3dbc31b..a1002ac53 100644
--- a/docs/android-examples/unlocking-android/GeocodeExample/.project
+++ b/docs/android-examples/unlocking-android/GeocodeExample/.project
@@ -1,6 +1,6 @@
- uad-GeocodeExample
+ GeocodeExample
@@ -20,6 +20,11 @@
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
com.android.ide.eclipse.adt.ApkBuilder
@@ -29,5 +34,6 @@
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
diff --git a/docs/android-examples/unlocking-android/NotifyAlarm/.classpath b/docs/android-examples/unlocking-android/NotifyAlarm/.classpath
index ef7c361cf..609aa00eb 100644
--- a/docs/android-examples/unlocking-android/NotifyAlarm/.classpath
+++ b/docs/android-examples/unlocking-android/NotifyAlarm/.classpath
@@ -1,6 +1,7 @@
+
diff --git a/docs/android-examples/unlocking-android/NotifyAlarm/.project b/docs/android-examples/unlocking-android/NotifyAlarm/.project
index cae7f6df6..80d951177 100644
--- a/docs/android-examples/unlocking-android/NotifyAlarm/.project
+++ b/docs/android-examples/unlocking-android/NotifyAlarm/.project
@@ -1,7 +1,9 @@
- uad-NotifyAlarm
-
+ NotifyAlarm
+
+ Unlocking Android book (http://code.google.com/p/unlocking-android/)
+
@@ -20,6 +22,11 @@
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
com.android.ide.eclipse.adt.ApkBuilder
@@ -29,5 +36,6 @@
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
diff --git a/docs/android-examples/unlocking-android/OpenGLSquare/.classpath b/docs/android-examples/unlocking-android/OpenGLSquare/.classpath
index ef7c361cf..30ec82080 100644
--- a/docs/android-examples/unlocking-android/OpenGLSquare/.classpath
+++ b/docs/android-examples/unlocking-android/OpenGLSquare/.classpath
@@ -1,6 +1,8 @@
+
+
diff --git a/docs/android-examples/unlocking-android/OpenGLSquare/.project b/docs/android-examples/unlocking-android/OpenGLSquare/.project
index 72632637c..49239d52c 100644
--- a/docs/android-examples/unlocking-android/OpenGLSquare/.project
+++ b/docs/android-examples/unlocking-android/OpenGLSquare/.project
@@ -1,7 +1,9 @@
OpenGLSquare
-
+
+ Unlocking Android book (http://code.google.com/p/unlocking-android/)
+
diff --git a/docs/android-examples/unlocking-android/ProviderExplorer/.classpath b/docs/android-examples/unlocking-android/ProviderExplorer/.classpath
index ef7c361cf..609aa00eb 100644
--- a/docs/android-examples/unlocking-android/ProviderExplorer/.classpath
+++ b/docs/android-examples/unlocking-android/ProviderExplorer/.classpath
@@ -1,6 +1,7 @@
+
diff --git a/docs/android-examples/unlocking-android/ProviderExplorer/.project b/docs/android-examples/unlocking-android/ProviderExplorer/.project
index 47b9d9be6..ada9d3771 100644
--- a/docs/android-examples/unlocking-android/ProviderExplorer/.project
+++ b/docs/android-examples/unlocking-android/ProviderExplorer/.project
@@ -1,7 +1,9 @@
- uad-ProviderExplorer
-
+ ProviderExplorer
+
+ Unlocking Android book (http://code.google.com/p/unlocking-android/)
+
@@ -20,6 +22,11 @@
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
com.android.ide.eclipse.adt.ApkBuilder
@@ -29,5 +36,6 @@
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
diff --git a/docs/android-examples/unlocking-android/README.txt b/docs/android-examples/unlocking-android/README.txt
index 4be43f964..33c80c64a 100644
--- a/docs/android-examples/unlocking-android/README.txt
+++ b/docs/android-examples/unlocking-android/README.txt
@@ -36,11 +36,11 @@ In order to build/run our Android examples we need to install the following
free software distributions (tested versions and download sites are given in
parenthesis) :
-1) Sun Java SDK 1.6 or newer (1.6.0_20 , www.sun.com/java/jdk/)
-2) Scala SDK 2.7.5 or newer (2.8.0_RC7, www.scala-lang.org/downloads/)
-3) Android SDK 1.5 or newer (2.2 , developer.android.com/sdk/)
-4) Apache Ant 1.7.0 or newer (1.8.1 , ant.apache.org/)
-5) ProGuard 4.4 or newer (4.5 , www.proguard.com/)
+1) Sun Java SDK 1.6 or newer (1.6.0_21 , www.sun.com/java/jdk/)
+2) Scala SDK 2.7.5 or newer (2.8.0.final, www.scala-lang.org/downloads/)
+3) Android SDK 1.5 or newer (2.2 , developer.android.com/sdk/)
+4) Apache Ant 1.7.0 or newer (1.8.1 , ant.apache.org/)
+5) ProGuard 4.4 or newer (4.5.1 , www.proguard.com/)
NB. In this document we rely on Ant tasks featured by the Scala SDK, the
Android SDK and the ProGuard shrinker and obfuscator tool (we will say more
diff --git a/docs/android-examples/unlocking-android/RestaurantFinder/.classpath b/docs/android-examples/unlocking-android/RestaurantFinder/.classpath
index fe42fb4ef..30ec82080 100644
--- a/docs/android-examples/unlocking-android/RestaurantFinder/.classpath
+++ b/docs/android-examples/unlocking-android/RestaurantFinder/.classpath
@@ -1,9 +1,8 @@
-
-
-
+
+
diff --git a/docs/android-examples/unlocking-android/RestaurantFinder/.project b/docs/android-examples/unlocking-android/RestaurantFinder/.project
index a43a42f84..6ecd62165 100644
--- a/docs/android-examples/unlocking-android/RestaurantFinder/.project
+++ b/docs/android-examples/unlocking-android/RestaurantFinder/.project
@@ -1,7 +1,9 @@
- uad-RestaurantFinder
-
+ RestaurantFinder
+
+ Unlocking Android book (http://code.google.com/p/unlocking-android/)
+
@@ -20,6 +22,11 @@
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
com.android.ide.eclipse.adt.ApkBuilder
@@ -29,5 +36,6 @@
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
diff --git a/docs/android-examples/unlocking-android/SMSNotifyExample/.classpath b/docs/android-examples/unlocking-android/SMSNotifyExample/.classpath
index ef7c361cf..30ec82080 100644
--- a/docs/android-examples/unlocking-android/SMSNotifyExample/.classpath
+++ b/docs/android-examples/unlocking-android/SMSNotifyExample/.classpath
@@ -1,6 +1,8 @@
+
+
diff --git a/docs/android-examples/unlocking-android/SMSNotifyExample2/.classpath b/docs/android-examples/unlocking-android/SMSNotifyExample2/.classpath
index ef7c361cf..30ec82080 100644
--- a/docs/android-examples/unlocking-android/SMSNotifyExample2/.classpath
+++ b/docs/android-examples/unlocking-android/SMSNotifyExample2/.classpath
@@ -1,6 +1,8 @@
+
+
diff --git a/docs/android-examples/unlocking-android/ServiceBinderExample/.classpath b/docs/android-examples/unlocking-android/ServiceBinderExample/.classpath
index 79a84816b..609aa00eb 100644
--- a/docs/android-examples/unlocking-android/ServiceBinderExample/.classpath
+++ b/docs/android-examples/unlocking-android/ServiceBinderExample/.classpath
@@ -1,7 +1,7 @@
-
+
diff --git a/docs/android-examples/unlocking-android/ServiceBinderExample/.project b/docs/android-examples/unlocking-android/ServiceBinderExample/.project
index adeb58f4d..e0df4ab75 100644
--- a/docs/android-examples/unlocking-android/ServiceBinderExample/.project
+++ b/docs/android-examples/unlocking-android/ServiceBinderExample/.project
@@ -1,7 +1,9 @@
- uad-ServiceBinderExample
-
+ ServiceBinderExample
+
+ Unlocking Android book (http://code.google.com/p/unlocking-android/)
+
@@ -20,6 +22,11 @@
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
com.android.ide.eclipse.adt.ApkBuilder
@@ -29,5 +36,6 @@
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
diff --git a/docs/android-examples/unlocking-android/SimpleAlarm/.classpath b/docs/android-examples/unlocking-android/SimpleAlarm/.classpath
index ef7c361cf..30ec82080 100644
--- a/docs/android-examples/unlocking-android/SimpleAlarm/.classpath
+++ b/docs/android-examples/unlocking-android/SimpleAlarm/.classpath
@@ -1,6 +1,8 @@
+
+
diff --git a/docs/android-examples/unlocking-android/SimpleAlarm/.project b/docs/android-examples/unlocking-android/SimpleAlarm/.project
index 09ac90fc0..e5b434914 100644
--- a/docs/android-examples/unlocking-android/SimpleAlarm/.project
+++ b/docs/android-examples/unlocking-android/SimpleAlarm/.project
@@ -1,8 +1,9 @@
- uad-SimpleAlarm
-
-
+ SimpleAlarm
+
+ Unlocking Android book (http://code.google.com/p/unlocking-android/)
+
@@ -20,6 +21,11 @@
+
+ ch.epfl.lamp.sdt.core.scalabuilder
+
+
+
com.android.ide.eclipse.adt.ApkBuilder
@@ -29,5 +35,6 @@
com.android.ide.eclipse.adt.AndroidNature
org.eclipse.jdt.core.javanature
+ ch.epfl.lamp.sdt.core.scalanature
diff --git a/docs/android-examples/unlocking-android/SimpleCamera/.classpath b/docs/android-examples/unlocking-android/SimpleCamera/.classpath
index ef7c361cf..30ec82080 100644
--- a/docs/android-examples/unlocking-android/SimpleCamera/.classpath
+++ b/docs/android-examples/unlocking-android/SimpleCamera/.classpath
@@ -1,6 +1,8 @@
+
+
diff --git a/docs/android-examples/unlocking-android/SimpleShape/res/values/strings.xml b/docs/android-examples/unlocking-android/SimpleShape/res/values/strings.xml
index 65df81353..2e36c9683 100644
--- a/docs/android-examples/unlocking-android/SimpleShape/res/values/strings.xml
+++ b/docs/android-examples/unlocking-android/SimpleShape/res/values/strings.xml
@@ -1,4 +1,4 @@
- SimpleShape (Scala)"
+ SimpleShape\n(Scala)"
diff --git a/docs/android-examples/unlocking-android/WindWaves/.classpath b/docs/android-examples/unlocking-android/WindWaves/.classpath
index 79a84816b..30ec82080 100644
--- a/docs/android-examples/unlocking-android/WindWaves/.classpath
+++ b/docs/android-examples/unlocking-android/WindWaves/.classpath
@@ -1,7 +1,8 @@
-
+
+
diff --git a/docs/android-examples/unlocking-android/WindWaves/src/com/msi/manning/windwaves/MapViewActivity.scala b/docs/android-examples/unlocking-android/WindWaves/src/com/msi/manning/windwaves/MapViewActivity.scala
index 59a1cb501..9b397a993 100644
--- a/docs/android-examples/unlocking-android/WindWaves/src/com/msi/manning/windwaves/MapViewActivity.scala
+++ b/docs/android-examples/unlocking-android/WindWaves/src/com/msi/manning/windwaves/MapViewActivity.scala
@@ -214,7 +214,7 @@ class MapViewActivity extends MapActivity {
true
}
- override def onMenuItemSelected(featureId: Int, item: MenuItem): Boolean =
+ override def onMenuItemSelected(featureId: Int, item: MenuItem): Boolean = {
item.getItemId match {
case MENU_SET_MAP =>
mapView setSatellite false
@@ -226,8 +226,9 @@ class MapViewActivity extends MapActivity {
mapController animateTo getLastKnownPoint
getBuoyData(getLastKnownPoint)
case _ =>
- super.onMenuItemSelected(featureId, item)
}
+ super.onMenuItemSelected(featureId, item)
+ }
// required by MapActivity for maps server to be notified if you are
// displaying directions
diff --git a/docs/android-examples/unlocking-android/XMLAnimate/res/values/strings.xml b/docs/android-examples/unlocking-android/XMLAnimate/res/values/strings.xml
index f0eb67132..2e6761812 100644
--- a/docs/android-examples/unlocking-android/XMLAnimate/res/values/strings.xml
+++ b/docs/android-examples/unlocking-android/XMLAnimate/res/values/strings.xml
@@ -1,4 +1,4 @@
- XMLAnimate (Scala)
+ XMLAnimate\n(Scala)
diff --git a/docs/android-examples/unlocking-android/build.xml b/docs/android-examples/unlocking-android/build.xml
index 0b1e8ac0b..7a953d452 100644
--- a/docs/android-examples/unlocking-android/build.xml
+++ b/docs/android-examples/unlocking-android/build.xml
@@ -21,7 +21,7 @@ Builds the Scala applications targeted to the Android platform.
+ excludes=".metadata,bin,configs,WindWaves" />