Merge the two PA example repos

bmeike · bmeike · commit f93c51f3efd1 · 2013-05-14T10:56:19.000-07:00
Conflicts:
	.gitignore
	02/FillListTask/tools/ide/eclipse/classpath
	02/SharedListTask/tools/ide/eclipse/classpath
	03/TestApp/tools/ide/eclipse/classpath
	06/AIDLDemo/tools/ide/eclipse/classpath
	06/AsyncTaskDemo/tools/ide/eclipse/classpath
	07/AndroidUIDemo/tools/ide/eclipse/classpath
	08/SimpleFragment/default.properties
	10/MicroJobs/tools/ant/build.xml
	11/FinchLifecycle/default.properties
	11/FinchLifecycle/proguard.cfg
	11/FinchLifecycleBackport/proguard.cfg
	12/FinchVideo/tools/ant/build.xml
	16/SensorDemos/default.properties
	16/SensorDemos/proguard.cfg
	17/ClientDemo/default.properties
	18/NDKDemo/default.properties
	AIDLDemo/project.properties
	AIDLDemo/tools/ide/eclipse/classpath
	AndroidUIDemo/project.properties
	AndroidUIDemo/res/layout/main.xml
	AndroidUIDemo/res/values/colors.xml
	AndroidUIDemo/src/com/oreilly/demo/android/pa/uidemo/view/DotView.java
	AndroidUIDemo/tools/ide/eclipse/classpath
	AndroidViewDemo/project.properties
	AsyncTaskDemo/proguard.cfg
	AsyncTaskDemo/tools/ant/build.xml
	AudioPlayer/proguard.cfg
	FillListTask/tools/ide/eclipse/classpath
	FinchChat/tools/ide/eclipse/classpath
	FinchFramework/project.properties
	FinchFramework/src/com/finchframework/finch/views/MesgEditText.java
	FinchLifecycle/project.properties
	FinchLifecycle/tools/ant/build.xml
	FinchLifecycle/tools/ide/eclipse/classpath
	FinchLifecycleBackport/proguard.cfg
	FinchLifecycleBackport/project.properties
	FinchVideo/project.properties
	FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/FinchVideoActivity.java
	NDKDemo/proguard.cfg
	NDKDemo/tools/ant/build.xml
	README.txt
	SearchDemo/project.properties
	SensorDemos/proguard.cfg
	SharedListTask/tools/ide/eclipse/classpath
	UIFramework/proguard.cfg
	UIFramework/project.properties
diff --git a/.gitignore b/.gitignore
@@ -3,8 +3,8 @@
 .classpath
 .project
 .settings
+.metadata
 bin
 gen
 lint.xml
-/.metadata
 
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/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
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
 android.library=true
diff --git a/FinchFramework/src/com/finchframework/finch/views/MesgEditText.java b/FinchFramework/src/com/finchframework/finch/views/MesgEditText.java
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">
-    <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" />
             </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" />
             </intent-filter>
         </activity>
     </application>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-sdk android:minSdkVersion="7" />
-</manifest>
+
+</manifest>
diff --git a/FinchVideo/project.properties b/FinchVideo/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-14
+target=android-15
 android.library.reference.1=../FinchFramework
diff --git a/FinchVideo/res/layout/video_query_activity.xml b/FinchVideo/res/layout/video_query_activity.xml
@@ -20,14 +20,13 @@
                 android:layout_gravity="center_horizontal"
                 android:background="@color/medium_gray"
                 >
-            <com.finchframework.finch.views.MesgEditText
+            <EditText
                     android:id="@+id/video_search_box"
                     android:width="0px"
                     android:height="40px"
                     android:layout_weight="1"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/finch_video_search"
                     android:lines="1"
                     android:singleLine="true"
                     />
diff --git a/FinchVideo/res/values/strings.xml b/FinchVideo/res/values/strings.xml
@@ -3,7 +3,7 @@
     <string name="finch_video_app_name">Finch Video</string>
     <string name="finch_video_update_content">Update Content</string>
     <string name="finch_video_search">Search Videos</string>
-    <string name="app_name">YouTube Video Example</string>
+    <string name="app_name">FinchVideo</string>
 
     <string name="simple_insert_text">Insert</string>
     <string name="title">Title</string>
diff --git a/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/FinchVideoActivity.java b/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/FinchVideoActivity.java
@@ -8,6 +8,7 @@
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.Editable;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -17,8 +18,9 @@
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
 import android.widget.TextView;
+
 import com.finchframework.finch.Finch;
-import com.finchframework.finch.views.MesgEditText;
+
 import com.oreilly.demo.android.pa.finchvideo.provider.FinchVideo;
 
 import java.io.FileNotFoundException;
@@ -33,7 +35,7 @@
 public class FinchVideoActivity extends Activity {
     SimpleCursorAdapter mAdapter;
 
-    private MesgEditText mSearchText;
+    private EditText mSearchText;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -83,8 +85,7 @@ public boolean setViewValue(View view, Cursor cursor, int i) {
 
         searchList.setAdapter(mAdapter);
 
-        mSearchText = (MesgEditText) findViewById(R.id.video_search_box);
-        mSearchText.setMesgText(r.getString(R.string.finch_video_search));
+        mSearchText = (EditText) findViewById(R.id.video_search_box);
         mSearchText.setOnEditorActionListener(
             new EditText.OnEditorActionListener() {
                 @Override
@@ -137,15 +138,28 @@ void setThumbResource(View view, Cursor cursor) {
 
     // sends the query to the finch video content provider
     void query() {
-        if (!mSearchText.searchEmpty()) {
+        String searchText = getText();
+        if (!searchEmpty(searchText)) {
             String queryString =
                 FinchVideo.Videos.QUERY_PARAM_NAME + "=" +
-                Uri.encode(mSearchText.getText().toString());
+                Uri.encode(searchText.toString());
             Uri queryUri =
                 Uri.parse(FinchVideo.Videos.CONTENT_URI + "?" +
                     queryString);
             Cursor c = managedQuery(queryUri, null, null, null, null);
             mAdapter.changeCursor(c);
         }
     }
+
+    private String getText() {
+        Editable editable = mSearchText.getText();
+        if (editable != null) {
+            return editable.toString();
+        }
+        return null;
+    }
+
+    private boolean searchEmpty(String text) {
+        return (text != null) && ("".equals(text));
+    }
 }
diff --git a/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/provider/FinchVideo.java b/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/provider/FinchVideo.java
@@ -23,10 +23,10 @@ public class FinchVideo {
     public static final int MEDIA_ID_COLUMN = 8;
 
     public static final String AUTHORITY =
-            "com.oreilly.demo.pa.finchvideo.FinchVideo";
+            "com.oreilly.demo.android.pa.finchvideo.FinchVideo";
 
     public static final String SIMPLE_AUTHORITY =
-            "com.oreilly.demo.pa.finchvideo.SimpleFinchVideo";
+            "com.oreilly.demo.android.pa.finchvideo.SimpleFinchVideo";
     /**
      * Simple Videos columns
      */
diff --git a/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/provider/FinchVideoContentProvider.java b/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/provider/FinchVideoContentProvider.java
@@ -32,7 +32,7 @@ public class FinchVideoContentProvider extends RESTfulContentProvider {
     public static final String VIDEOS_TABLE_NAME = "video";
 
     private static final String FILE_CACHE_DIR =
-            "/data/data/com.oreilly.demo.pa.finchvideo/file_cache";
+            "/data/data/com.oreilly.demo.android.pa.finchvideo/file_cache";
 
     private static final int VIDEOS = 1;
     private static final int VIDEO_ID = 2;
diff --git a/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/provider/SimpleFinchVideoContentProvider.java b/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/provider/SimpleFinchVideoContentProvider.java
diff --git a/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/provider/YouTubeHandler.java b/FinchVideo/src/com/oreilly/demo/android/pa/finchvideo/provider/YouTubeHandler.java
diff --git a/JSerializable/project.properties b/JSerializable/project.properties
diff --git a/LifecycleDemos/project.properties b/LifecycleDemos/project.properties
diff --git a/MicroJobs/project.properties b/MicroJobs/project.properties
diff --git a/SensorDemos/project.properties b/SensorDemos/project.properties
diff --git a/SimpleFragment/project.properties b/SimpleFragment/project.properties
