Merge branch 'master' of github.com:bmeike/ProgrammingAndroid2Examples

ldornin · ldornin · commit 5fc19efa07af · 2013-05-14T22:44:13.000-04:00
Conflicts:
	FinchFramework/project.properties
	FinchVideo/AndroidManifest.xml
	FinchVideo/project.properties
	FinchVideo/res/layout/video_query_activity.xml
	FinchVideo/res/values/strings.xml
	FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/FinchVideoActivity.java
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 .classpath
 .project
 .settings
+.metadata
 bin
 gen
 lint.xml
diff --git a/AIDLDemo/project.properties b/AIDLDemo/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
diff --git a/AndroidUIDemo/project.properties b/AndroidUIDemo/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
diff --git a/AndroidUIDemo/res/layout/main.xml b/AndroidUIDemo/res/layout/main.xml
@@ -3,7 +3,7 @@
     android:id="@+id/root"
     android:orientation="vertical"
     android:gravity="center_horizontal"
-    android:background="@drawable/lt_grey"
+    android:background="@color/lt_grey"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:baselineAligned="false">
@@ -14,12 +14,12 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="@drawable/white"
+        android:background="@color/white"
         />
     
   <LinearLayout
       android:orientation="horizontal"
-      android:background="@drawable/grey"
+      android:background="@color/grey"
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
@@ -42,22 +42,22 @@
 
   <LinearLayout
       android:orientation="horizontal"
-      android:background="@drawable/dk_grey"
+      android:background="@color/dk_grey"
       android:layout_width="match_parent"
       android:layout_height="wrap_content">
 
     <Button
         android:id="@+id/button1"
         android:text="@string/labelRed"
-        android:textColor="@drawable/red"
+        android:textColor="@color/red"
         android:layout_height="wrap_content"
         android:layout_width="0dp"
         android:layout_weight="1"/>
 
     <Button
         android:id="@+id/button2"
         android:text="@string/labelGreen"
-        android:textColor="@drawable/green"
+        android:textColor="@color/green"
         android:layout_height="wrap_content"
         android:layout_width="0dp"
         android:layout_weight="1"/>
diff --git a/AndroidUIDemo/res/values/colors.xml b/AndroidUIDemo/res/values/colors.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <resources>
-    <drawable name="red">#ffff0000</drawable>
-    <drawable name="green">#ff00ff00</drawable>
-    <drawable name="lt_grey">#dddddd</drawable>
-    <drawable name="grey">#999999</drawable>
-    <drawable name="dk_grey">#666666</drawable>
-    <drawable name="white">#ffffffff</drawable>
+    <color name="red">#ffff0000</color>
+    <color name="green">#ff00ff00</color>
+    <color name="lt_grey">#dddddd</color>
+    <color name="grey">#999999</color>
+    <color name="dk_grey">#666666</color>
+    <color name="white">#ffffffff</color>
 </resources>
diff --git a/AndroidUIDemo/src/com/oreilly/demo/android/pa/uidemo/view/DotView.java b/AndroidUIDemo/src/com/oreilly/demo/android/pa/uidemo/view/DotView.java
@@ -58,8 +58,6 @@ public DotView(Context context, AttributeSet attrs, int defStyle) {
      * @see android.view.View#onDraw(android.graphics.Canvas)
      */
     @Override protected void onDraw(Canvas canvas) {
-        //canvas.drawColor(Color.WHITE);
-
         Paint paint = new Paint();
         paint.setStyle(Style.STROKE);
         paint.setColor(hasFocus() ? Color.BLUE : Color.GRAY);
diff --git a/AndroidViewDemo/project.properties b/AndroidViewDemo/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
diff --git a/AsyncTaskDemo/project.properties b/AsyncTaskDemo/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
diff --git a/ClientDemo/project.properties b/ClientDemo/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
diff --git a/ContactViewer/project.properties b/ContactViewer/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-7
+target=android-15
diff --git a/FinchChat/AndroidManifest.xml b/FinchChat/AndroidManifest.xml
@@ -1,28 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.finchframework.finch"
-          android:versionCode="1"
-          android:versionName="1.0">
-    <application android:icon="@drawable/icon"
-                 android:label="@string/app_name"
-                 android:debuggable="true">
-        <activity android:name=".FinchWelcome"
-                  android:label="@string/app_name">
+    package="com.finchframework.finch"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <application
+        android:debuggable="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+        <activity
+            android:name=".FinchWelcome"
+            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name="com.finchframework.bluetooth.BtConsoleActivity" />
-        <activity android:name="com.finchframework.bluetooth.DeviceListActivity"
-                  android:label="@string/select_device"
-                  android:configChanges="orientation|keyboardHidden"/>
-        <activity android:name="animate.AnimateActivity"></activity>
+        <activity
+            android:name="com.finchframework.bluetooth.DeviceListActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:label="@string/select_device" />
+        <activity android:name="animate.AnimateActivity" >
+        </activity>
     </application>
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
-	<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
     <uses-sdk android:minSdkVersion="7" />
-</manifest>
+
+</manifest>
diff --git a/FinchChat/project.properties b/FinchChat/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
 android.library=false
diff --git a/FinchFramework/project.properties b/FinchFramework/project.properties
@@ -3,13 +3,10 @@
 #
 # This file must be checked in Version Control Systems.
 #
-# To customize properties used by the Ant build system edit
+# To customize properties used by the Ant build system use,
 # "ant.properties", and override values to adapt the script to your
 # project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
-android.library=true
 # Project target.
-target=android-16
+target=android-15
+android.library=true
diff --git a/FinchLifecycle/project.properties b/FinchLifecycle/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
diff --git a/FinchLifecycleBackport/project.properties b/FinchLifecycleBackport/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-7
+target=android-15
 android.library.reference.1=../FinchFramework
diff --git a/FinchVideo/AndroidManifest.xml b/FinchVideo/AndroidManifest.xml
@@ -1,32 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.oreilly.demo.android.pa.finchvideo"
-          android:versionCode="1"
-          android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="16"/>
-    <application android:icon="@drawable/icon"
-                 android:label="@string/app_name"
-                 android:debuggable="true">
-        <provider android:name=".provider.FinchVideoContentProvider"
-                  android:authorities="com.oreilly.demo.android.pa.finchvideo.FinchVideo"
-                />
-        <provider android:name=".provider.SimpleFinchVideoContentProvider"
-                  android:authorities="com.oreilly.demo.android.pa.finchvideo.SimpleFinchVideo"
-                />
-        <activity android:name=".FinchVideoActivity"
-                  android:label="@string/finch_video_app_name">
+    package="com.oreilly.demo.android.pa.finchvideo"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <uses-sdk android:minSdkVersion="7" />
+
+    <application
+        android:debuggable="true"
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+        <provider
+            android:name=".provider.FinchVideoContentProvider"
+            android:authorities="com.oreilly.demo.android.pa.finchvideo.FinchVideo" />
+        <provider
+            android:name=".provider.SimpleFinchVideoContentProvider"
+            android:authorities="com.oreilly.demo.android.pa.finchvideo.SimpleFinchVideo" />
+
+        <activity
+            android:name=".FinchVideoActivity"
+            android:label="@string/finch_video_app_name" >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".SimpleFinchVideoActivity"
-                  android:label="Simple Video Activity">
+        <activity
+            android:name=".SimpleFinchVideoActivity"
+            android:label="Simple Video Activity" >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
+
+</manifest>
diff --git a/FinchVideo/project.properties b/FinchVideo/project.properties
@@ -8,6 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-16
+target=android-15
 android.library.reference.1=../FinchFramework
-
diff --git a/JSerializable/project.properties b/JSerializable/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
diff --git a/LifecycleDemos/project.properties b/LifecycleDemos/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
diff --git a/MicroJobs/project.properties b/MicroJobs/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:8
+target=Google Inc.:Google APIs:15
diff --git a/README.txt b/README.txt
@@ -15,3 +15,5 @@ Start eclipse and use File > Import > "Existing project into workspace"
 
 Comments are welcome! Send problems and comments to programmingandroidexamples at callmeike dot net.
 
+Code for the 1st edition can be obtained by checking out the the tag v1.0
+
diff --git a/SensorDemos/project.properties b/SensorDemos/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
diff --git a/SimpleFragment/project.properties b/SimpleFragment/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
