From d2962a33216ce40a526c80fc8865cf9bd04936f4 Mon Sep 17 00:00:00 2001
From: James Yum <jyum@google.com>
Date: Wed, 2 Dec 2009 17:10:20 -0800
Subject: [PATCH 01/17] TextToSpeech API demo.

---
 samples/ApiDemos/AndroidManifest.xml          |   9 ++
 .../ApiDemos/res/layout/text_to_speech.xml    |  26 ++++
 samples/ApiDemos/res/values/strings.xml       |   3 +
 .../apis/app/TextToSpeechActivity.java        | 136 ++++++++++++++++++
 4 files changed, 174 insertions(+)
 create mode 100644 samples/ApiDemos/res/layout/text_to_speech.xml
 create mode 100644 samples/ApiDemos/src/com/example/android/apis/app/TextToSpeechActivity.java

diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index aba330a68..a6eff9641 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -543,6 +543,15 @@
             </intent-filter>
         </activity>
 
+        <!-- Text-To-Speech Samples -->
+
+        <activity android:name=".app.TextToSpeechActivity" android:label="@string/text_to_speech">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+
         <!-- ************************************* -->
         <!--        CONTENT PACKAGE SAMPLES        -->
         <!-- ************************************* -->
diff --git a/samples/ApiDemos/res/layout/text_to_speech.xml b/samples/ApiDemos/res/layout/text_to_speech.xml
new file mode 100644
index 000000000..0ba60e1a8
--- /dev/null
+++ b/samples/ApiDemos/res/layout/text_to_speech.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    <Button android:id="@+id/again_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:enabled="false"
+        android:text="@string/again" />
+</LinearLayout>
diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml
index 6f91b3476..b19504b08 100644
--- a/samples/ApiDemos/res/values/strings.xml
+++ b/samples/ApiDemos/res/values/strings.xml
@@ -221,6 +221,9 @@
 
     <string name="voice_recognition">App/Voice Recognition</string>
 
+    <string name="text_to_speech">App/Text-To-Speech</string>
+    <string name="again">Again</string>
+
     <!-- ============================== -->
     <!--  app/content examples strings  -->
     <!-- ============================== -->
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/TextToSpeechActivity.java b/samples/ApiDemos/src/com/example/android/apis/app/TextToSpeechActivity.java
new file mode 100644
index 000000000..a693e8036
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/app/TextToSpeechActivity.java
@@ -0,0 +1,136 @@
+ /*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.apis.app;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.speech.tts.TextToSpeech;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+
+import com.example.android.apis.R;
+
+import java.util.Locale;
+import java.util.Random;
+
+/**
+ * <p>Demonstrates text-to-speech (TTS). Please note the following steps:</p>
+ *
+ * <ol>
+ * <li>Construct the TextToSpeech object.</li>
+ * <li>Handle initialization callback in the onInit method.
+ * The activity implements TextToSpeech.OnInitListener for this purpose.</li>
+ * <li>Call TextToSpeech.speak to synthesize speech.</li>
+ * <li>Shutdown TextToSpeech in onDestroy.</li>
+ * </ol>
+ *
+ * <p>Documentation:
+ * http://developer.android.com/reference/android/speech/tts/package-summary.html
+ * </p>
+ * <ul>
+ */
+public class TextToSpeechActivity extends Activity implements TextToSpeech.OnInitListener {
+
+    private static final String TAG = "TextToSpeechDemo";
+
+    private TextToSpeech mTts;
+    private Button mAgainButton;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.text_to_speech);
+
+        // Initialize text-to-speech. This is an asynchronous operation.
+        // The OnInitListener (second argument) is called after initialization completes.
+        mTts = new TextToSpeech(this,
+            this  // TextToSpeech.OnInitListener
+            );
+
+        // The button is disabled in the layout.
+        // It will be enabled upon initialization of the TTS engine.
+        mAgainButton = (Button) findViewById(R.id.again_button);
+
+        mAgainButton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                sayHello();
+            }
+        });
+    }
+
+    @Override
+    public void onDestroy() {
+        // Don't forget to shutdown!
+        if (mTts != null) {
+            mTts.stop();
+            mTts.shutdown();
+        }
+
+        super.onDestroy();
+    }
+
+    // Implements TextToSpeech.OnInitListener.
+    public void onInit(int status) {
+        // status can be either TextToSpeech.SUCCESS or TextToSpeech.ERROR.
+        if (status == TextToSpeech.SUCCESS) {
+            // Set preferred language to US english.
+            // Note that a language may not be available, and the result will indicate this.
+            int result = mTts.setLanguage(Locale.US);
+            // Try this someday for some interesting results.
+            // int result mTts.setLanguage(Locale.FRANCE);
+            if (result == TextToSpeech.LANG_MISSING_DATA ||
+                result == TextToSpeech.LANG_NOT_SUPPORTED) {
+               // Lanuage data is missing or the language is not supported.
+                Log.e(TAG, "Language is not available.");
+            } else {
+                // Check the documentation for other possible result codes.
+                // For example, the language may be available for the locale,
+                // but not for the specified country and variant.
+
+                // The TTS engine has been successfully initialized.
+                // Allow the user to press the button for the app to speak again.
+                mAgainButton.setEnabled(true);
+                // Greet the user.
+                sayHello();
+            }
+        } else {
+            // Initialization failed.
+            Log.e(TAG, "Could not initialize TextToSpeech.");
+        }
+    }
+
+    private static final Random RANDOM = new Random();
+    private static final String[] HELLOS = {
+      "Hello",
+      "Salutations",
+      "Greetings",
+      "Howdy",
+      "What's crack-a-lackin?",
+      "That explains the stench!"
+    };
+
+    private void sayHello() {
+        // Select a random hello.
+        int helloLength = HELLOS.length;
+        String hello = HELLOS[RANDOM.nextInt(helloLength)];
+        mTts.speak(hello,
+            TextToSpeech.QUEUE_FLUSH,  // Drop all pending entries in the playback queue.
+            null);
+    }
+
+}

From 25b6aed7b2e01ce7bdc0dfa1a79eaf009ad178fe Mon Sep 17 00:00:00 2001
From: Scott Main <smain@google.com>
Date: Tue, 8 Dec 2009 14:50:17 -0800
Subject: [PATCH 02/17] change the way bytes are read from InputStream. Read
 only the bytes received and don't allocate new arrays Also revise the
 mechanism for writing the outgoing messages to the screen to be more
 consistent with reading and cleanup line lengths to be <100 chars.

---
 .../android/BluetoothChat/BluetoothChat.java  | 37 ++++++++++++-------
 .../BluetoothChat/BluetoothChatService.java   | 21 ++++-------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/samples/BluetoothChat/src/com/example/android/BluetoothChat/BluetoothChat.java b/samples/BluetoothChat/src/com/example/android/BluetoothChat/BluetoothChat.java
index e4b9d5289..d05bbd611 100644
--- a/samples/BluetoothChat/src/com/example/android/BluetoothChat/BluetoothChat.java
+++ b/samples/BluetoothChat/src/com/example/android/BluetoothChat/BluetoothChat.java
@@ -50,14 +50,13 @@ public class BluetoothChat extends Activity {
     // Message types sent from the BluetoothChatService Handler
     public static final int MESSAGE_STATE_CHANGE = 1;
     public static final int MESSAGE_READ = 2;
-    public static final int MESSAGE_OUTGOING_STRING = 3;
+    public static final int MESSAGE_WRITE = 3;
     public static final int MESSAGE_DEVICE_NAME = 4;
     public static final int MESSAGE_TOAST = 5;
 
     // Key names received from the BluetoothChatService Handler
     public static final String DEVICE_NAME = "device_name";
     public static final String TOAST = "toast";
-    public static final String MESSAGE_WRITE = "message_write";
 
     // Intent request codes
     private static final int REQUEST_CONNECT_DEVICE = 1;
@@ -192,9 +191,10 @@ public class BluetoothChat extends Activity {
 
     private void ensureDiscoverable() {
         if(D) Log.d(TAG, "ensure discoverable");
-        if (mBluetoothAdapter.getScanMode() != BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
+        if (mBluetoothAdapter.getScanMode() !=
+            BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
             Intent discoverableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_DISCOVERABLE);
-            discoverableIntent.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 300); // set max duration
+            discoverableIntent.putExtra(BluetoothAdapter.EXTRA_DISCOVERABLE_DURATION, 300);
             startActivity(discoverableIntent);
         }
     }
@@ -223,7 +223,8 @@ public class BluetoothChat extends Activity {
     }
 
     // The action listener for the EditText widget, to listen for the return key
-    private TextView.OnEditorActionListener mWriteListener = new TextView.OnEditorActionListener() {
+    private TextView.OnEditorActionListener mWriteListener =
+        new TextView.OnEditorActionListener() {
         public boolean onEditorAction(TextView view, int actionId, KeyEvent event) {
             // If the action is a key-up event on the return key, send the message
             if (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_UP) {
@@ -257,20 +258,27 @@ public class BluetoothChat extends Activity {
                     break;
                 }
                 break;
-            case MESSAGE_OUTGOING_STRING:
-                mConversationArrayAdapter.add("Me:   " + new String(msg.getData().getByteArray(MESSAGE_WRITE)).trim());
-                mOutEditText.setText(mOutStringBuffer);
+            case MESSAGE_WRITE:
+                byte[] writeBuf = (byte[]) msg.obj;
+                // construct a string from the buffer
+                String writeMessage = new String(writeBuf);
+                mConversationArrayAdapter.add("Me:  " + writeMessage);
                 break;
             case MESSAGE_READ:
-                byte[] buf = (byte[]) msg.obj;
-                mConversationArrayAdapter.add(mConnectedDeviceName+":   " + new String(buf).trim());
+                byte[] readBuf = (byte[]) msg.obj;
+                // construct a string from the valid bytes in the buffer
+                String readMessage = new String(readBuf, 0, msg.arg1);
+                mConversationArrayAdapter.add(mConnectedDeviceName+":  " + readMessage);
                 break;
             case MESSAGE_DEVICE_NAME:
-                mConnectedDeviceName = msg.getData().getString(DEVICE_NAME); // save the connected device's name
-                Toast.makeText(getApplicationContext(), "Connected to " + mConnectedDeviceName, Toast.LENGTH_SHORT).show();
+                // save the connected device's name
+                mConnectedDeviceName = msg.getData().getString(DEVICE_NAME);
+                Toast.makeText(getApplicationContext(), "Connected to "
+                               + mConnectedDeviceName, Toast.LENGTH_SHORT).show();
                 break;
             case MESSAGE_TOAST:
-                Toast.makeText(getApplicationContext(), msg.getData().getString(TOAST), Toast.LENGTH_SHORT).show();
+                Toast.makeText(getApplicationContext(), msg.getData().getString(TOAST),
+                               Toast.LENGTH_SHORT).show();
                 break;
             }
         }
@@ -283,7 +291,8 @@ public class BluetoothChat extends Activity {
             // When DeviceListActivity returns with a device to connect
             if (resultCode == Activity.RESULT_OK) {
                 // Get the device MAC address
-                String address = data.getExtras().getString(DeviceListActivity.EXTRA_DEVICE_ADDRESS);
+                String address = data.getExtras()
+                                     .getString(DeviceListActivity.EXTRA_DEVICE_ADDRESS);
                 // Get the BLuetoothDevice object
                 BluetoothDevice device = mBluetoothAdapter.getRemoteDevice(address);
                 // Attempt to connect to the device
diff --git a/samples/BluetoothChat/src/com/example/android/BluetoothChat/BluetoothChatService.java b/samples/BluetoothChat/src/com/example/android/BluetoothChat/BluetoothChatService.java
index 8d29c6a99..d0c1d43cd 100644
--- a/samples/BluetoothChat/src/com/example/android/BluetoothChat/BluetoothChatService.java
+++ b/samples/BluetoothChat/src/com/example/android/BluetoothChat/BluetoothChatService.java
@@ -57,7 +57,7 @@ public class BluetoothChatService {
     private int mState;
 
     // Constants that indicate the current connection state
-    public static final int STATE_NONE = 0;       // we're doing nothing. only valid during setup/shutdown
+    public static final int STATE_NONE = 0;       // we're doing nothing
     public static final int STATE_LISTEN = 1;     // now listening for incoming connections
     public static final int STATE_CONNECTING = 2; // now initiating an outgoing connection
     public static final int STATE_CONNECTED = 3;  // now connected to a remote device
@@ -397,10 +397,8 @@ public class BluetoothChatService {
                     bytes = mmInStream.read(buffer);
 
                     // Send the obtained bytes to the UI Activity
-                    mHandler.obtainMessage(BluetoothChat.MESSAGE_READ, bytes, -1, buffer).sendToTarget();
-
-                    // Reload the buffer to clear extra bytes from the previous read
-                    buffer = new byte[1024];
+                    mHandler.obtainMessage(BluetoothChat.MESSAGE_READ, bytes, -1, buffer)
+                            .sendToTarget();
                 } catch (IOException e) {
                     Log.e(TAG, "disconnected", e);
                     connectionLost();
@@ -411,18 +409,15 @@ public class BluetoothChatService {
 
         /**
          * Write to the connected OutStream.
-         * @param b  The bytes to write
+         * @param buffer  The bytes to write
          */
-        public void write(byte[] b) {
+        public void write(byte[] buffer) {
             try {
-                mmOutStream.write(b);
+                mmOutStream.write(buffer);
 
                 // Share the sent message back to the UI Activity
-                Message msg = mHandler.obtainMessage(BluetoothChat.MESSAGE_OUTGOING_STRING);
-                Bundle bundle = new Bundle();
-                bundle.putByteArray(BluetoothChat.MESSAGE_WRITE, b);
-                msg.setData(bundle);
-                mHandler.sendMessage(msg);
+                mHandler.obtainMessage(BluetoothChat.MESSAGE_WRITE, -1, -1, buffer)
+                        .sendToTarget();
             } catch (IOException e) {
                 Log.e(TAG, "Exception during write", e);
             }

From c6d634b850ef17c77457b47e352a5136f78bd33f Mon Sep 17 00:00:00 2001
From: Trevor Johns <tjohns@google.com>
Date: Tue, 24 Nov 2009 05:16:35 -0800
Subject: [PATCH 03/17] Adding ContactManager sample to SDK samples.

This sample demonstrates use of the ContactsContract classes introduced in API Level 5.
---
 samples/ContactManager/Android.mk             |  16 +
 samples/ContactManager/AndroidManifest.xml    |  35 ++
 samples/ContactManager/_index.html            |  10 +
 .../ContactManager/res/drawable-hdpi/icon.png | Bin 0 -> 4147 bytes
 .../ContactManager/res/drawable-ldpi/icon.png | Bin 0 -> 1723 bytes
 .../ContactManager/res/drawable-mdpi/icon.png | Bin 0 -> 2574 bytes
 .../res/layout/account_entry.xml              |  49 +++
 .../res/layout/contact_adder.xml              |  80 ++++
 .../res/layout/contact_entry.xml              |  24 ++
 .../res/layout/contact_manager.xml            |  33 ++
 samples/ContactManager/res/values/strings.xml |  33 ++
 .../android/contactmanager/ContactAdder.java  | 390 ++++++++++++++++++
 .../contactmanager/ContactManager.java        | 124 ++++++
 13 files changed, 794 insertions(+)
 create mode 100644 samples/ContactManager/Android.mk
 create mode 100644 samples/ContactManager/AndroidManifest.xml
 create mode 100644 samples/ContactManager/_index.html
 create mode 100644 samples/ContactManager/res/drawable-hdpi/icon.png
 create mode 100644 samples/ContactManager/res/drawable-ldpi/icon.png
 create mode 100644 samples/ContactManager/res/drawable-mdpi/icon.png
 create mode 100644 samples/ContactManager/res/layout/account_entry.xml
 create mode 100644 samples/ContactManager/res/layout/contact_adder.xml
 create mode 100644 samples/ContactManager/res/layout/contact_entry.xml
 create mode 100644 samples/ContactManager/res/layout/contact_manager.xml
 create mode 100644 samples/ContactManager/res/values/strings.xml
 create mode 100644 samples/ContactManager/src/com/google/example/android/contactmanager/ContactAdder.java
 create mode 100644 samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java

diff --git a/samples/ContactManager/Android.mk b/samples/ContactManager/Android.mk
new file mode 100644
index 000000000..c58571685
--- /dev/null
+++ b/samples/ContactManager/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := samples
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := ContactManager
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
+
+# Use the following include to make our test apk.
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/samples/ContactManager/AndroidManifest.xml b/samples/ContactManager/AndroidManifest.xml
new file mode 100644
index 000000000..c0a01cd31
--- /dev/null
+++ b/samples/ContactManager/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.example.android.contactmanager"
+    android:versionCode="1" android:versionName="1.0">
+    <application android:label="@string/app_name" android:icon="@drawable/icon">
+        <activity android:name=".ContactManager" 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="ContactAdder" android:label="@string/addContactTitle">
+        </activity>
+
+    </application>
+    <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="5" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+</manifest>
diff --git a/samples/ContactManager/_index.html b/samples/ContactManager/_index.html
new file mode 100644
index 000000000..1fd51f06f
--- /dev/null
+++ b/samples/ContactManager/_index.html
@@ -0,0 +1,10 @@
+<p>A sample application that demonstrates how to manually query the system contacts provider using
+the new <code><a
+href="../../../reference/android/provider/ContactsContract.html">ContactsContract</a></code> API, as
+well as manually insert contacts into a specific account.</p>
+
+<p>In most cases, you will want to ask the existing Contacts activity to handle these tasks for you,
+resulting in a more consistent user experience.</p>
+
+<img alt="Screenshot 1" src="../images/ContactManager1.png" />
+<img alt="Screenshot 2" src="../images/ContactManager2.png" />
\ No newline at end of file
diff --git a/samples/ContactManager/res/drawable-hdpi/icon.png b/samples/ContactManager/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8074c4c571b8cd19e27f4ee5545df367420686d7
GIT binary patch
literal 4147
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

literal 0
HcmV?d00001

diff --git a/samples/ContactManager/res/drawable-ldpi/icon.png b/samples/ContactManager/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1095584ec21f71cd0afc9e0993aa2209671b590c
GIT binary patch
literal 1723
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
Rn%e*X002ovPDHLkV1g`*Fem^3

literal 0
HcmV?d00001

diff --git a/samples/ContactManager/res/drawable-mdpi/icon.png b/samples/ContactManager/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a07c69fa5a0f4da5d5efe96eea12a543154dbab6
GIT binary patch
literal 2574
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

literal 0
HcmV?d00001

diff --git a/samples/ContactManager/res/layout/account_entry.xml b/samples/ContactManager/res/layout/account_entry.xml
new file mode 100644
index 000000000..435e73766
--- /dev/null
+++ b/samples/ContactManager/res/layout/account_entry.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:padding="6dip">
+    <ImageView
+        android:id="@+id/accountIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="6dip" />
+    <TextView
+        android:id="@+id/secondAccountLine"
+        android:layout_width="fill_parent"
+        android:layout_height="26dip"
+        android:layout_toRightOf="@id/accountIcon"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textColor="@android:color/secondary_text_light" />
+    <TextView
+        android:id="@+id/firstAccountLine"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/accountIcon"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_above="@id/secondAccountLine"
+        android:layout_alignWithParentIfMissing="true"
+        android:gravity="center_vertical"
+        android:textColor="@android:color/primary_text_light"/>
+</RelativeLayout>
diff --git a/samples/ContactManager/res/layout/contact_adder.xml b/samples/ContactManager/res/layout/contact_adder.xml
new file mode 100644
index 000000000..92d06f305
--- /dev/null
+++ b/samples/ContactManager/res/layout/contact_adder.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+    <TableLayout android:layout_width="fill_parent"
+                 android:layout_height="fill_parent">
+        <TableRow>
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:text="@string/targetAccountLabel"/>
+        </TableRow>
+        <TableRow>
+            <Spinner android:layout_height="wrap_content"
+                     android:layout_width="fill_parent"
+                     android:layout_weight="1"
+                     android:id="@+id/accountSpinner"/>
+        </TableRow>
+        <TableRow>
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:text="@string/contactNameLabel"/>
+        </TableRow>
+        <TableRow>
+            <EditText android:id="@+id/contactNameEditText"
+                      android:layout_height="wrap_content"
+                      android:layout_width="wrap_content"
+                      android:layout_weight="1"/>
+        </TableRow>
+        <TableRow>
+            <TextView android:text="@string/contactPhoneLabel"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"/>
+        </TableRow>
+        <TableRow>
+            <EditText android:id="@+id/contactPhoneEditText"
+                      android:layout_height="wrap_content"
+                      android:layout_width="wrap_content"
+                      android:layout_weight="1"/>
+            <Spinner android:id="@+id/contactPhoneTypeSpinner"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"/>
+        </TableRow>
+        <TableRow>
+            <TextView android:text="@string/contactEmailLabel"
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"/>
+        </TableRow>
+        <TableRow>
+            <EditText android:id="@+id/contactEmailEditText"
+                      android:layout_height="wrap_content"
+                      android:layout_width="wrap_content"
+                      android:layout_weight="1"/>
+            <Spinner android:id="@+id/contactEmailTypeSpinner"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"/>
+        </TableRow>
+        <TableRow>
+            <Button android:layout_height="wrap_content"
+                    android:text="@string/save"
+                    android:id="@+id/contactSaveButton"
+                    android:layout_width="fill_parent"
+                    android:layout_weight="1"/>
+        </TableRow>
+    </TableLayout>
+</ScrollView>
diff --git a/samples/ContactManager/res/layout/contact_entry.xml b/samples/ContactManager/res/layout/contact_entry.xml
new file mode 100644
index 000000000..9909025a7
--- /dev/null
+++ b/samples/ContactManager/res/layout/contact_entry.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content">
+    <TextView android:text="@+id/contactEntryText"
+              android:id="@+id/contactEntryText"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"/>
+</LinearLayout>
diff --git a/samples/ContactManager/res/layout/contact_manager.xml b/samples/ContactManager/res/layout/contact_manager.xml
new file mode 100644
index 000000000..73f6f8151
--- /dev/null
+++ b/samples/ContactManager/res/layout/contact_manager.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="fill_parent"
+              android:layout_height="fill_parent">
+    <ListView android:layout_width="fill_parent"
+              android:id="@+id/contactList"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"/>
+    <CheckBox android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:id="@+id/showInvisible"
+              android:text="@string/showInvisible"/>
+    <Button android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/addContactButton"
+            android:text="@string/addContactButtonLabel"/>
+</LinearLayout>
diff --git a/samples/ContactManager/res/values/strings.xml b/samples/ContactManager/res/values/strings.xml
new file mode 100644
index 000000000..c7a65b4a0
--- /dev/null
+++ b/samples/ContactManager/res/values/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string name="accountSpinnerLabel">Account</string>
+    <string name="addContactButtonLabel">Add Contact</string>
+    <string name="addContactTitle">Add Contact</string>
+    <string name="allAccounts">All Accounts</string>
+    <string name="app_name">Contact Manager</string>
+    <string name="contactCreationFailure">Contact creation failed, check logs.</string>
+    <string name="contactEmailLabel">Contact Email</string>
+    <string name="contactNameLabel">Contact Name</string>
+    <string name="contactPhoneLabel">Contact Phone</string>
+    <string name="save">Save</string>
+    <string name="selectAccountLabel">Select</string>
+    <string name="selectLabel">Select label</string>
+    <string name="showInvisible">Show Invisible Contacts (Only)</string>
+    <string name="targetAccountLabel">Target Account</string>
+    <string name="undefinedTypeLabel">(Undefined)</string>
+</resources>
diff --git a/samples/ContactManager/src/com/google/example/android/contactmanager/ContactAdder.java b/samples/ContactManager/src/com/google/example/android/contactmanager/ContactAdder.java
new file mode 100644
index 000000000..92ad5a237
--- /dev/null
+++ b/samples/ContactManager/src/com/google/example/android/contactmanager/ContactAdder.java
@@ -0,0 +1,390 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.example.android.contactmanager;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
+import android.accounts.OnAccountsUpdateListener;
+import android.app.Activity;
+import android.content.ContentProviderOperation;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.Toast;
+import android.widget.AdapterView.OnItemSelectedListener;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public final class ContactAdder extends Activity implements OnAccountsUpdateListener
+{
+    public static final String TAG = "ContactsAdder";
+    public static final String ACCOUNT_NAME =
+            "com.google.example.android.contactmanager.ContactsAdder.ACCOUNT_NAME";
+    public static final String ACCOUNT_TYPE =
+            "com.google.example.android.contactmanager.ContactsAdder.ACCOUNT_TYPE";
+
+    private ArrayList<AccountData> mAccounts;
+    private AccountAdapter mAccountAdapter;
+    private Spinner mAccountSpinner;
+    private EditText mContactEmailEditText;
+    private ArrayList<Integer> mContactEmailTypes;
+    private Spinner mContactEmailTypeSpinner;
+    private EditText mContactNameEditText;
+    private EditText mContactPhoneEditText;
+    private ArrayList<Integer> mContactPhoneTypes;
+    private Spinner mContactPhoneTypeSpinner;
+    private Button mContactSaveButton;
+    private AccountData mSelectedAccount;
+
+    /**
+     * Called when the activity is first created. Responsible for initializing the UI.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        Log.v(TAG, "Activity State: onCreate()");
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.contact_adder);
+
+        // Obtain handles to UI objects
+        mAccountSpinner = (Spinner) findViewById(R.id.accountSpinner);
+        mContactNameEditText = (EditText) findViewById(R.id.contactNameEditText);
+        mContactPhoneEditText = (EditText) findViewById(R.id.contactPhoneEditText);
+        mContactEmailEditText = (EditText) findViewById(R.id.contactEmailEditText);
+        mContactPhoneTypeSpinner = (Spinner) findViewById(R.id.contactPhoneTypeSpinner);
+        mContactEmailTypeSpinner = (Spinner) findViewById(R.id.contactEmailTypeSpinner);
+        mContactSaveButton = (Button) findViewById(R.id.contactSaveButton);
+
+        // Prepare list of supported account types
+        // Note: Other types are available in ContactsContract.CommonDataKinds
+        //       Also, be aware that type IDs differ between Phone and Email, and MUST be computed
+        //       separately.
+        mContactPhoneTypes = new ArrayList<Integer>();
+        mContactPhoneTypes.add(ContactsContract.CommonDataKinds.Phone.TYPE_HOME);
+        mContactPhoneTypes.add(ContactsContract.CommonDataKinds.Phone.TYPE_WORK);
+        mContactPhoneTypes.add(ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE);
+        mContactPhoneTypes.add(ContactsContract.CommonDataKinds.Phone.TYPE_OTHER);
+        mContactEmailTypes = new ArrayList<Integer>();
+        mContactEmailTypes.add(ContactsContract.CommonDataKinds.Email.TYPE_HOME);
+        mContactEmailTypes.add(ContactsContract.CommonDataKinds.Email.TYPE_WORK);
+        mContactEmailTypes.add(ContactsContract.CommonDataKinds.Email.TYPE_MOBILE);
+        mContactEmailTypes.add(ContactsContract.CommonDataKinds.Email.TYPE_OTHER);
+
+        // Prepare model for account spinner
+        mAccounts = new ArrayList<AccountData>();
+        mAccountAdapter = new AccountAdapter(this, mAccounts);
+        mAccountSpinner.setAdapter(mAccountAdapter);
+
+        // Populate list of account types for phone
+        ArrayAdapter<String> adapter;
+        adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        Iterator<Integer> iter;
+        iter = mContactPhoneTypes.iterator();
+        while (iter.hasNext()) {
+            adapter.add(ContactsContract.CommonDataKinds.Phone.getTypeLabel(
+                    this.getResources(),
+                    iter.next(),
+                    getString(R.string.undefinedTypeLabel)).toString());
+        }
+        mContactPhoneTypeSpinner.setAdapter(adapter);
+        mContactPhoneTypeSpinner.setPrompt(getString(R.string.selectLabel));
+
+        // Populate list of account types for email
+        adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        iter = mContactEmailTypes.iterator();
+        while (iter.hasNext()) {
+            adapter.add(ContactsContract.CommonDataKinds.Email.getTypeLabel(
+                    this.getResources(),
+                    iter.next(),
+                    getString(R.string.undefinedTypeLabel)).toString());
+        }
+        mContactEmailTypeSpinner.setAdapter(adapter);
+        mContactEmailTypeSpinner.setPrompt(getString(R.string.selectLabel));
+
+        // Prepare the system account manager. On registering the listener below, we also ask for
+        // an initial callback to pre-populate the account list.
+        AccountManager.get(this).addOnAccountsUpdatedListener(this, null, true);
+
+        // Register handlers for UI elements
+        mAccountSpinner.setOnItemSelectedListener(new OnItemSelectedListener() {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long i) {
+                updateAccountSelection();
+            }
+
+            public void onNothingSelected(AdapterView<?> parent) {
+                // We don't need to worry about nothing being selected, since Spinners don't allow
+                // this.
+            }
+        });
+        mContactSaveButton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                onSaveButtonClicked();
+            }
+        });
+    }
+
+    /**
+     * Actions for when the Save button is clicked. Creates a contact entry and terminates the
+     * activity.
+     */
+    private void onSaveButtonClicked() {
+        Log.v(TAG, "Save button clicked");
+        createContactEntry();
+        finish();
+    }
+
+    /**
+     * Creates a contact entry from the current UI values in the account named by mSelectedAccount.
+     */
+    protected void createContactEntry() {
+        // Get values from UI
+        String name = mContactNameEditText.getText().toString();
+        String phone = mContactPhoneEditText.getText().toString();
+        String email = mContactEmailEditText.getText().toString();
+        int phoneType = mContactPhoneTypes.get(
+                mContactPhoneTypeSpinner.getSelectedItemPosition());
+        int emailType = mContactEmailTypes.get(
+                mContactEmailTypeSpinner.getSelectedItemPosition());;
+
+        // Prepare contact creation request
+        //
+        // Note: We use RawContacts because this data must be associated with a particular account.
+        //       The system will aggregate this with any other data for this contact and create a
+        //       coresponding entry in the ContactsContract.Contacts provider for us.
+        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+        ops.add(ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
+                .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, mSelectedAccount.getType())
+                .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, mSelectedAccount.getName())
+                .build());
+        ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+                .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+                .withValue(ContactsContract.Data.MIMETYPE,
+                        ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
+                .withValue(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, name)
+                .build());
+        ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+                .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+                .withValue(ContactsContract.Data.MIMETYPE,
+                        ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
+                .withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, phone)
+                .withValue(ContactsContract.CommonDataKinds.Phone.TYPE, phoneType)
+                .build());
+        ops.add(ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI)
+                .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0)
+                .withValue(ContactsContract.Data.MIMETYPE,
+                        ContactsContract.CommonDataKinds.Email.CONTENT_ITEM_TYPE)
+                .withValue(ContactsContract.CommonDataKinds.Email.DATA, email)
+                .withValue(ContactsContract.CommonDataKinds.Email.TYPE, emailType)
+                .build());
+
+        // Ask the Contact provider to create a new contact
+        Log.i(TAG,"Selected account: " + mSelectedAccount.getName() + " (" +
+                mSelectedAccount.getType() + ")");
+        Log.i(TAG,"Creating contact: " + name);
+        try {
+            getContentResolver().applyBatch(ContactsContract.AUTHORITY, ops);
+        } catch (Exception e) {
+            // Display warning
+            Context ctx = getApplicationContext();
+            CharSequence txt = getString(R.string.contactCreationFailure);
+            int duration = Toast.LENGTH_SHORT;
+            Toast toast = Toast.makeText(ctx, txt, duration);
+            toast.show();
+
+            // Log exception
+            Log.e(TAG, "Exceptoin encoutered while inserting contact: " + e);
+        }
+    }
+
+    /**
+     * Called when this activity is about to be destroyed by the system.
+     */
+    @Override
+    public void onDestroy() {
+        // Remove AccountManager callback
+        AccountManager.get(this).removeOnAccountsUpdatedListener(this);
+        super.onDestroy();
+    }
+
+    /**
+     * Updates account list spinner when the list of Accounts on the system changes. Satisfies
+     * OnAccountsUpdateListener implementation.
+     */
+    public void onAccountsUpdated(Account[] a) {
+        Log.i(TAG, "Account list update detected");
+        // Clear out any old data to prevent duplicates
+        mAccounts.clear();
+
+        // Get account data from system
+        AuthenticatorDescription[] accountTypes = AccountManager.get(this).getAuthenticatorTypes();
+
+        // Populate tables
+        for (int i = 0; i < a.length; i++) {
+            // The user may have multiple accounts with the same name, so we need to construct a
+            // meaningful display name for each.
+            String systemAccountType = a[i].type;
+            AuthenticatorDescription ad = getAuthenticatorDescription(systemAccountType,
+                    accountTypes);
+            AccountData data = new AccountData(a[i].name, ad);
+            mAccounts.add(data);
+        }
+
+        // Update the account spinner
+        mAccountAdapter.notifyDataSetChanged();
+    }
+
+    /**
+     * Obtain the AuthenticatorDescription for a given account type.
+     * @param type The account type to locate.
+     * @param dictionary An array of AuthenticatorDescriptions, as returned by AccountManager.
+     * @return The description for the specified account type.
+     */
+    private static AuthenticatorDescription getAuthenticatorDescription(String type,
+            AuthenticatorDescription[] dictionary) {
+        for (int i = 0; i < dictionary.length; i++) {
+            if (dictionary[i].type.equals(type)) {
+                return dictionary[i];
+            }
+        }
+        // No match found
+        throw new RuntimeException("Unable to find matching authenticator");
+    }
+
+    /**
+     * Update account selection. If NO_ACCOUNT is selected, then we prohibit inserting new contacts.
+     */
+    private void updateAccountSelection() {
+        // Read current account selection
+        mSelectedAccount = (AccountData) mAccountSpinner.getSelectedItem();
+    }
+
+    /**
+     * A container class used to repreresent all known information about an account.
+     */
+    private class AccountData {
+        private String mName;
+        private String mType;
+        private CharSequence mTypeLabel;
+        private Drawable mIcon;
+
+        /**
+         * @param name The name of the account. This is usually the user's email address or
+         *        username.
+         * @param description The description for this account. This will be dictated by the
+         *        type of account returned, and can be obtained from the system AccountManager.
+         */
+        public AccountData(String name, AuthenticatorDescription description) {
+            mName = name;
+            if (description != null) {
+                mType = description.type;
+
+                // The type string is stored in a resource, so we need to convert it into something
+                // human readable.
+                String packageName = description.packageName;
+                PackageManager pm = getPackageManager();
+
+                if (description.labelId != 0) {
+                    mTypeLabel = pm.getText(packageName, description.labelId, null);
+                    if (mTypeLabel == null) {
+                        throw new IllegalArgumentException("LabelID provided, but label not found");
+                    }
+                } else {
+                    mTypeLabel = "";
+                }
+
+                if (description.iconId != 0) {
+                    mIcon = pm.getDrawable(packageName, description.iconId, null);
+                    if (mIcon == null) {
+                        throw new IllegalArgumentException("IconID provided, but drawable not " +
+                                "found");
+                    }
+                } else {
+                    mIcon = getResources().getDrawable(android.R.drawable.sym_def_app_icon);
+                }
+            }
+        }
+
+        public String getName() {
+            return mName;
+        }
+
+        public String getType() {
+            return mType;
+        }
+
+        public CharSequence getTypeLabel() {
+            return mTypeLabel;
+        }
+
+        public Drawable getIcon() {
+            return mIcon;
+        }
+
+        public String toString() {
+            return mName;
+        }
+    }
+
+    /**
+     * Custom adapter used to display account icons and descriptions in the account spinner.
+     */
+    private class AccountAdapter extends ArrayAdapter<AccountData> {
+        public AccountAdapter(Context context, ArrayList<AccountData> accountData) {
+            super(context, android.R.layout.simple_spinner_item, accountData);
+            setDropDownViewResource(R.layout.account_entry);
+        }
+
+        public View getDropDownView(int position, View convertView, ViewGroup parent) {
+            // Inflate a view template
+            if (convertView == null) {
+                LayoutInflater layoutInflater = getLayoutInflater();
+                convertView = layoutInflater.inflate(R.layout.account_entry, parent, false);
+            }
+            TextView firstAccountLine = (TextView) convertView.findViewById(R.id.firstAccountLine);
+            TextView secondAccountLine = (TextView) convertView.findViewById(R.id.secondAccountLine);
+            ImageView accountIcon = (ImageView) convertView.findViewById(R.id.accountIcon);
+
+            // Populate template
+            AccountData data = getItem(position);
+            firstAccountLine.setText(data.getName());
+            secondAccountLine.setText(data.getTypeLabel());
+            Drawable icon = data.getIcon();
+            if (icon == null) {
+                icon = getResources().getDrawable(android.R.drawable.ic_menu_search);
+            }
+            accountIcon.setImageDrawable(icon);
+            return convertView;
+        }
+    }
+}
diff --git a/samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java b/samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java
new file mode 100644
index 000000000..c4d9803fa
--- /dev/null
+++ b/samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.example.android.contactmanager;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+
+public final class ContactManager extends Activity
+{
+
+    public static final String TAG = "ContactManager";
+
+    private Button mAddAccountButton;
+    private ListView mContactList;
+    private boolean mShowInvisible;
+    private CheckBox mShowInvisibleControl;
+
+    /**
+     * Called when the activity is first created. Responsible for initializing the UI.
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        Log.v(TAG, "Activity State: onCreate()");
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.contact_manager);
+
+        // Obtain handles to UI objects
+        mAddAccountButton = (Button) findViewById(R.id.addContactButton);
+        mContactList = (ListView) findViewById(R.id.contactList);
+        mShowInvisibleControl = (CheckBox) findViewById(R.id.showInvisible);
+
+        // Initialize class properties
+        mShowInvisible = false;
+        mShowInvisibleControl.setChecked(mShowInvisible);
+
+        // Register handler for UI elements
+        mAddAccountButton.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                Log.d(TAG, "mAddAccountButton clicked");
+                launchContactAdder();
+            }
+        });
+        mShowInvisibleControl.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                Log.d(TAG, "mShowInvisibleControl changed: " + isChecked);
+                mShowInvisible = isChecked;
+                populateContactList();
+            }
+        });
+
+        // Populate the contact list
+        populateContactList();
+    }
+
+    /**
+     * Populate the contact list based on account currently selected in the account spinner.
+     */
+    private void populateContactList() {
+        // Build adapter with contact entries
+        Cursor cursor = getContacts();
+        String[] fields = new String[] {
+                ContactsContract.Data.DISPLAY_NAME
+        };
+        SimpleCursorAdapter adapter = new SimpleCursorAdapter(this, R.layout.contact_entry, cursor,
+                fields, new int[] {R.id.contactEntryText});
+        mContactList.setAdapter(adapter);
+    }
+
+    /**
+     * Obtains the contact list for the currently selected account.
+     *
+     * @return A cursor for for accessing the contact list.
+     */
+    private Cursor getContacts()
+    {
+        // Run query
+        Uri uri = ContactsContract.Contacts.CONTENT_URI;
+        String[] projection = new String[] {
+                ContactsContract.Contacts.LOOKUP_KEY,
+                ContactsContract.Contacts.DISPLAY_NAME
+        };
+        String selection = ContactsContract.Contacts.IN_VISIBLE_GROUP + " = '" +
+                (mShowInvisible ? "0" : "1") + "'";
+        String[] selectionArgs = null;
+        String sortOrder = ContactsContract.Contacts.DISPLAY_NAME + " COLLATE LOCALIZED ASC";
+
+        return managedQuery(uri, projection, selection, selectionArgs, sortOrder);
+    }
+
+    /**
+     * Launches the ContactAdder activity to add a new contact to the selected accont.
+     */
+    protected void launchContactAdder() {
+        Intent i = new Intent(this, ContactAdder.class);
+        startActivity(i);
+    }
+}

From bba4ff7c38e7e6837fabdb225cdb24d12a17eabc Mon Sep 17 00:00:00 2001
From: Trevor Johns <tjohns@google.com>
Date: Tue, 8 Dec 2009 23:23:53 -0800
Subject: [PATCH 04/17] Fixing crash in ContactManager: Changing
 ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.

---
 .../google/example/android/contactmanager/ContactManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java b/samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java
index c4d9803fa..7b416b084 100644
--- a/samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java
+++ b/samples/ContactManager/src/com/google/example/android/contactmanager/ContactManager.java
@@ -103,7 +103,7 @@ public final class ContactManager extends Activity
         // Run query
         Uri uri = ContactsContract.Contacts.CONTENT_URI;
         String[] projection = new String[] {
-                ContactsContract.Contacts.LOOKUP_KEY,
+                ContactsContract.Contacts._ID,
                 ContactsContract.Contacts.DISPLAY_NAME
         };
         String selection = ContactsContract.Contacts.IN_VISIBLE_GROUP + " = '" +

From 5dc449896cb596159652d15e7333d74e53601609 Mon Sep 17 00:00:00 2001
From: Jack Palevich <jackpal@google.com>
Date: Fri, 27 Nov 2009 19:54:46 +0800
Subject: [PATCH 05/17] Add OpenGL ES 2.0 sample.

This sample renders a textured triangle using OpenGL ES 2.0.

If OpenGL ES 2.0 is not available, the sample falls back to
using OpenGL ES 1.0.
---
 samples/ApiDemos/AndroidManifest.xml          |  10 +
 .../android/apis/graphics/GLES20Activity.java |  72 +++++
 .../apis/graphics/GLES20TriangleRenderer.java | 255 ++++++++++++++++++
 3 files changed, 337 insertions(+)
 create mode 100644 samples/ApiDemos/src/com/example/android/apis/graphics/GLES20Activity.java
 create mode 100644 samples/ApiDemos/src/com/example/android/apis/graphics/GLES20TriangleRenderer.java

diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index a0b8705fb..c96417889 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -1416,6 +1416,16 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".graphics.GLES20Activity"
+                android:label="Graphics/OpenGL ES/OpenGL ES 2.0"
+                android:theme="@android:style/Theme.NoTitleBar"
+                android:configChanges="orientation|keyboardHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+        
         <activity android:name=".graphics.TranslucentGLSurfaceViewActivity"
                 android:label="Graphics/OpenGL ES/Translucent GLSurfaceView"
                 android:theme="@style/Theme.Translucent"
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/GLES20Activity.java b/samples/ApiDemos/src/com/example/android/apis/graphics/GLES20Activity.java
new file mode 100644
index 000000000..f5573cf48
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/GLES20Activity.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.apis.graphics;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.pm.ConfigurationInfo;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+
+/**
+ * This sample shows how to check for OpenGL ES 2.0 support at runtime, and then
+ * use either OpenGL ES 1.0 or OpenGL ES 2.0, as appropriate.
+ */
+public class GLES20Activity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mGLSurfaceView = new GLSurfaceView(this);
+        if (detectOpenGLES20()) {
+            // Tell the surface view we want to create an OpenGL ES 2.0-compatible
+            // context, and set an OpenGL ES 2.0-compatible renderer.
+            mGLSurfaceView.setEGLContextClientVersion(2);
+            mGLSurfaceView.setRenderer(new GLES20TriangleRenderer(this));
+        } else {
+            // Set an OpenGL ES 1.x-compatible renderer. In a real application
+            // this renderer might approximate the same output as the 2.0 renderer.
+            mGLSurfaceView.setRenderer(new TriangleRenderer(this));
+        }
+        setContentView(mGLSurfaceView);
+    }
+
+    private boolean detectOpenGLES20() {
+        ActivityManager am =
+            (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
+        ConfigurationInfo info = am.getDeviceConfigurationInfo();
+        return (info.reqGlEsVersion >= 0x20000);
+    }
+
+    @Override
+    protected void onResume() {
+        // Ideally a game should implement onResume() and onPause()
+        // to take appropriate action when the activity looses focus
+        super.onResume();
+        mGLSurfaceView.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        // Ideally a game should implement onResume() and onPause()
+        // to take appropriate action when the activity looses focus
+        super.onPause();
+        mGLSurfaceView.onPause();
+    }
+
+    private GLSurfaceView mGLSurfaceView;
+}
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/GLES20TriangleRenderer.java b/samples/ApiDemos/src/com/example/android/apis/graphics/GLES20TriangleRenderer.java
new file mode 100644
index 000000000..956eb6862
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/GLES20TriangleRenderer.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.apis.graphics;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.opengl.GLES20;
+import android.opengl.GLSurfaceView;
+import android.opengl.GLUtils;
+import android.opengl.Matrix;
+import android.os.SystemClock;
+import android.util.Log;
+
+import com.example.android.apis.R;
+
+class GLES20TriangleRenderer implements GLSurfaceView.Renderer {
+
+    public GLES20TriangleRenderer(Context context) {
+        mContext = context;
+        mTriangleVertices = ByteBuffer.allocateDirect(mTriangleVerticesData.length
+                * FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
+        mTriangleVertices.put(mTriangleVerticesData).position(0);
+    }
+
+    public void onDrawFrame(GL10 glUnused) {
+        // Ignore the passed-in GL10 interface, and use the GLES20
+        // class's static methods instead.
+        GLES20.glClearColor(0.0f, 0.0f, 1.0f, 1.0f);
+        GLES20.glClear( GLES20.GL_DEPTH_BUFFER_BIT | GLES20.GL_COLOR_BUFFER_BIT);
+        GLES20.glUseProgram(mProgram);
+        checkGlError("glUseProgram");
+
+        GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mTextureID);
+
+        mTriangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
+        GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false,
+                TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
+        checkGlError("glVertexAttribPointer maPosition");
+        mTriangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
+        GLES20.glEnableVertexAttribArray(maPositionHandle);
+        checkGlError("glEnableVertexAttribArray maPositionHandle");
+        GLES20.glVertexAttribPointer(maTextureHandle, 2, GLES20.GL_FLOAT, false,
+                TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices);
+        checkGlError("glVertexAttribPointer maTextureHandle");
+        GLES20.glEnableVertexAttribArray(maTextureHandle);
+        checkGlError("glEnableVertexAttribArray maTextureHandle");
+
+        long time = SystemClock.uptimeMillis() % 4000L;
+        float angle = 0.090f * ((int) time);
+        Matrix.setRotateM(mMMatrix, 0, angle, 0, 0, 1.0f);
+        Matrix.multiplyMM(mMVPMatrix, 0, mVMatrix, 0, mMMatrix, 0);
+        Matrix.multiplyMM(mMVPMatrix, 0, mProjMatrix, 0, mMVPMatrix, 0);
+
+        GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mMVPMatrix, 0);
+        GLES20.glDrawArrays(GLES20.GL_TRIANGLES, 0, 3);
+        checkGlError("glDrawArrays");
+    }
+
+    public void onSurfaceChanged(GL10 glUnused, int width, int height) {
+        // Ignore the passed-in GL10 interface, and use the GLES20
+        // class's static methods instead.
+        GLES20.glViewport(0, 0, width, height);
+        float ratio = (float) width / height;
+        Matrix.frustumM(mProjMatrix, 0, -ratio, ratio, -1, 1, 3, 7);
+    }
+
+    public void onSurfaceCreated(GL10 glUnused, EGLConfig config) {
+        // Ignore the passed-in GL10 interface, and use the GLES20
+        // class's static methods instead.
+        mProgram = createProgram(mVertexShader, mFragmentShader);
+        if (mProgram == 0) {
+            return;
+        }
+        maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
+        checkGlError("glGetAttribLocation aPosition");
+        if (maPositionHandle == -1) {
+            throw new RuntimeException("Could not get attrib location for aPosition");
+        }
+        maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
+        checkGlError("glGetAttribLocation aTextureCoord");
+        if (maTextureHandle == -1) {
+            throw new RuntimeException("Could not get attrib location for aTextureCoord");
+        }
+
+        muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
+        checkGlError("glGetUniformLocation uMVPMatrix");
+        if (muMVPMatrixHandle == -1) {
+            throw new RuntimeException("Could not get attrib location for uMVPMatrix");
+        }
+
+        /*
+         * Create our texture. This has to be done each time the
+         * surface is created.
+         */
+
+        int[] textures = new int[1];
+        GLES20.glGenTextures(1, textures, 0);
+
+        mTextureID = textures[0];
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, mTextureID);
+
+        GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER,
+                GLES20.GL_NEAREST);
+        GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D,
+                GLES20.GL_TEXTURE_MAG_FILTER,
+                GLES20.GL_LINEAR);
+
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S,
+                GLES20.GL_REPEAT);
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T,
+                GLES20.GL_REPEAT);
+
+        InputStream is = mContext.getResources()
+            .openRawResource(R.raw.robot);
+        Bitmap bitmap;
+        try {
+            bitmap = BitmapFactory.decodeStream(is);
+        } finally {
+            try {
+                is.close();
+            } catch(IOException e) {
+                // Ignore.
+            }
+        }
+
+        GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, bitmap, 0);
+        bitmap.recycle();
+
+        Matrix.setLookAtM(mVMatrix, 0, 0, 0, -5, 0f, 0f, 0f, 0f, 1.0f, 0.0f);
+    }
+
+    private int loadShader(int shaderType, String source) {
+        int shader = GLES20.glCreateShader(shaderType);
+        if (shader != 0) {
+            GLES20.glShaderSource(shader, source);
+            GLES20.glCompileShader(shader);
+            int[] compiled = new int[1];
+            GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
+            if (compiled[0] == 0) {
+                Log.e(TAG, "Could not compile shader " + shaderType + ":");
+                Log.e(TAG, GLES20.glGetShaderInfoLog(shader));
+                GLES20.glDeleteShader(shader);
+                shader = 0;
+            }
+        }
+        return shader;
+    }
+
+    private int createProgram(String vertexSource, String fragmentSource) {
+        int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
+        if (vertexShader == 0) {
+            return 0;
+        }
+
+        int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
+        if (pixelShader == 0) {
+            return 0;
+        }
+
+        int program = GLES20.glCreateProgram();
+        if (program != 0) {
+            GLES20.glAttachShader(program, vertexShader);
+            checkGlError("glAttachShader");
+            GLES20.glAttachShader(program, pixelShader);
+            checkGlError("glAttachShader");
+            GLES20.glLinkProgram(program);
+            int[] linkStatus = new int[1];
+            GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
+            if (linkStatus[0] != GLES20.GL_TRUE) {
+                Log.e(TAG, "Could not link program: ");
+                Log.e(TAG, GLES20.glGetProgramInfoLog(program));
+                GLES20.glDeleteProgram(program);
+                program = 0;
+            }
+        }
+        return program;
+    }
+
+    private void checkGlError(String op) {
+        int error;
+        while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+            Log.e(TAG, op + ": glError " + error);
+            throw new RuntimeException(op + ": glError " + error);
+        }
+    }
+
+    private static final int FLOAT_SIZE_BYTES = 4;
+    private static final int TRIANGLE_VERTICES_DATA_STRIDE_BYTES = 5 * FLOAT_SIZE_BYTES;
+    private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0;
+    private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3;
+    private final float[] mTriangleVerticesData = {
+            // X, Y, Z, U, V
+            -1.0f, -0.5f, 0, -0.5f, 0.0f,
+            1.0f, -0.5f, 0, 1.5f, -0.0f,
+            0.0f,  1.11803399f, 0, 0.5f,  1.61803399f };
+
+    private FloatBuffer mTriangleVertices;
+
+    private final String mVertexShader =
+        "uniform mat4 uMVPMatrix;\n" +
+        "attribute vec4 aPosition;\n" +
+        "attribute vec2 aTextureCoord;\n" +
+        "varying vec2 vTextureCoord;\n" +
+        "void main() {\n" +
+        "  gl_Position = uMVPMatrix * aPosition;\n" +
+        "  vTextureCoord = aTextureCoord;\n" +
+        "}\n";
+
+    private final String mFragmentShader =
+        "precision mediump float;\n" +
+        "varying vec2 vTextureCoord;\n" +
+        "uniform sampler2D sTexture;\n" +
+        "void main() {\n" +
+        "  gl_FragColor = texture2D(sTexture, vTextureCoord);\n" +
+        "}\n";
+
+    private float[] mMVPMatrix = new float[16];
+    private float[] mProjMatrix = new float[16];
+    private float[] mMMatrix = new float[16];
+    private float[] mVMatrix = new float[16];
+
+    private int mProgram;
+    private int mTextureID;
+    private int muMVPMatrixHandle;
+    private int maPositionHandle;
+    private int maTextureHandle;
+
+    private Context mContext;
+    private static String TAG = "GLES20TriangleRenderer";
+}

From 3c31d6cded51b6e6719b0052ec9987ca7218c868 Mon Sep 17 00:00:00 2001
From: Jack Palevich <jackpal@google.com>
Date: Wed, 9 Dec 2009 15:32:35 +0800
Subject: [PATCH 06/17] Simple Matrix Palette skinning sample.

---
 samples/ApiDemos/AndroidManifest.xml          |   9 +
 .../apis/graphics/MatrixPaletteActivity.java  |  52 +++
 .../apis/graphics/MatrixPaletteRenderer.java  | 408 ++++++++++++++++++
 3 files changed, 469 insertions(+)
 create mode 100644 samples/ApiDemos/src/com/example/android/apis/graphics/MatrixPaletteActivity.java
 create mode 100644 samples/ApiDemos/src/com/example/android/apis/graphics/MatrixPaletteRenderer.java

diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index c96417889..4dbf13683 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -1426,6 +1426,15 @@
             </intent-filter>
         </activity>
         
+        <activity android:name=".graphics.MatrixPaletteActivity"
+                android:label="Graphics/OpenGL ES/Matrix Palette Skinning"
+                android:configChanges="orientation|keyboardHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.SAMPLE_CODE" />
+            </intent-filter>
+        </activity>
+        
         <activity android:name=".graphics.TranslucentGLSurfaceViewActivity"
                 android:label="Graphics/OpenGL ES/Translucent GLSurfaceView"
                 android:theme="@style/Theme.Translucent"
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/MatrixPaletteActivity.java b/samples/ApiDemos/src/com/example/android/apis/graphics/MatrixPaletteActivity.java
new file mode 100644
index 000000000..520e0e1c8
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/MatrixPaletteActivity.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.apis.graphics;
+
+import android.app.Activity;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+
+/**
+ * This sample shows how to implement a Matrix Palette
+ */
+public class MatrixPaletteActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mGLSurfaceView = new GLSurfaceView(this);
+        mGLSurfaceView.setRenderer(new MatrixPaletteRenderer(this));
+        setContentView(mGLSurfaceView);
+    }
+
+    @Override
+    protected void onResume() {
+        // Ideally a game should implement onResume() and onPause()
+        // to take appropriate action when the activity looses focus
+        super.onResume();
+        mGLSurfaceView.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        // Ideally a game should implement onResume() and onPause()
+        // to take appropriate action when the activity looses focus
+        super.onPause();
+        mGLSurfaceView.onPause();
+    }
+
+    private GLSurfaceView mGLSurfaceView;
+}
diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/MatrixPaletteRenderer.java b/samples/ApiDemos/src/com/example/android/apis/graphics/MatrixPaletteRenderer.java
new file mode 100644
index 000000000..e0e2db166
--- /dev/null
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/MatrixPaletteRenderer.java
@@ -0,0 +1,408 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.apis.graphics;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.CharBuffer;
+import java.nio.FloatBuffer;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL;
+import javax.microedition.khronos.opengles.GL10;
+import javax.microedition.khronos.opengles.GL11;
+import javax.microedition.khronos.opengles.GL11Ext;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.opengl.GLSurfaceView;
+import android.opengl.GLU;
+import android.opengl.GLUtils;
+import android.os.SystemClock;
+
+import com.example.android.apis.R;
+
+public class MatrixPaletteRenderer implements GLSurfaceView.Renderer{
+    private Context mContext;
+    private Grid mGrid;
+    private int mTextureID;
+
+    /** A grid is a topologically rectangular array of vertices.
+     *
+     * This grid class is customized for the vertex data required for this
+     * example.
+     *
+     * The vertex and index data are held in VBO objects because on most
+     * GPUs VBO objects are the fastest way of rendering static vertex
+     * and index data.
+     *
+     */
+
+    private static class Grid {
+        // Size of vertex data elements in bytes:
+        final static int FLOAT_SIZE = 4;
+        final static int CHAR_SIZE = 2;
+
+        // Vertex structure:
+        // float x, y, z;
+        // float u, v;
+        // float weight0, weight1;
+        // byte palette0, palette1, pad0, pad1;
+
+        final static int VERTEX_SIZE = 8 * FLOAT_SIZE;
+        final static int VERTEX_TEXTURE_BUFFER_INDEX_OFFSET = 3;
+        final static int VERTEX_WEIGHT_BUFFER_INDEX_OFFSET = 5;
+        final static int VERTEX_PALETTE_INDEX_OFFSET = 7 * FLOAT_SIZE;
+
+        private int mVertexBufferObjectId;
+        private int mElementBufferObjectId;
+
+        // These buffers are used to hold the vertex and index data while
+        // constructing the grid. Once createBufferObjects() is called
+        // the buffers are nulled out to save memory.
+
+        private ByteBuffer mVertexByteBuffer;
+        private FloatBuffer mVertexBuffer;
+        private CharBuffer mIndexBuffer;
+
+        private int mW;
+        private int mH;
+        private int mIndexCount;
+
+        public Grid(int w, int h) {
+            if (w < 0 || w >= 65536) {
+                throw new IllegalArgumentException("w");
+            }
+            if (h < 0 || h >= 65536) {
+                throw new IllegalArgumentException("h");
+            }
+            if (w * h >= 65536) {
+                throw new IllegalArgumentException("w * h >= 65536");
+            }
+
+            mW = w;
+            mH = h;
+            int size = w * h;
+
+            mVertexByteBuffer = ByteBuffer.allocateDirect(VERTEX_SIZE * size)
+                .order(ByteOrder.nativeOrder());
+            mVertexBuffer = mVertexByteBuffer.asFloatBuffer();
+
+            int quadW = mW - 1;
+            int quadH = mH - 1;
+            int quadCount = quadW * quadH;
+            int indexCount = quadCount * 6;
+            mIndexCount = indexCount;
+            mIndexBuffer = ByteBuffer.allocateDirect(CHAR_SIZE * indexCount)
+                .order(ByteOrder.nativeOrder()).asCharBuffer();
+
+            /*
+             * Initialize triangle list mesh.
+             *
+             *     [0]-----[  1] ...
+             *      |    /   |
+             *      |   /    |
+             *      |  /     |
+             *     [w]-----[w+1] ...
+             *      |       |
+             *
+             */
+
+            {
+                int i = 0;
+                for (int y = 0; y < quadH; y++) {
+                    for (int x = 0; x < quadW; x++) {
+                        char a = (char) (y * mW + x);
+                        char b = (char) (y * mW + x + 1);
+                        char c = (char) ((y + 1) * mW + x);
+                        char d = (char) ((y + 1) * mW + x + 1);
+
+                        mIndexBuffer.put(i++, a);
+                        mIndexBuffer.put(i++, c);
+                        mIndexBuffer.put(i++, b);
+
+                        mIndexBuffer.put(i++, b);
+                        mIndexBuffer.put(i++, c);
+                        mIndexBuffer.put(i++, d);
+                    }
+                }
+            }
+
+        }
+
+        public void set(int i, int j, float x, float y, float z,
+                float u, float v,
+                float w0, float w1,
+                int p0, int p1) {
+            if (i < 0 || i >= mW) {
+                throw new IllegalArgumentException("i");
+            }
+            if (j < 0 || j >= mH) {
+                throw new IllegalArgumentException("j");
+            }
+
+            if (w0 + w1 != 1.0f) {
+                throw new IllegalArgumentException("Weights must add up to 1.0f");
+            }
+
+            int index = mW * j + i;
+
+            mVertexBuffer.position(index * VERTEX_SIZE / FLOAT_SIZE);
+            mVertexBuffer.put(x);
+            mVertexBuffer.put(y);
+            mVertexBuffer.put(z);
+            mVertexBuffer.put(u);
+            mVertexBuffer.put(v);
+            mVertexBuffer.put(w0);
+            mVertexBuffer.put(w1);
+
+            mVertexByteBuffer.position(index * VERTEX_SIZE + VERTEX_PALETTE_INDEX_OFFSET);
+            mVertexByteBuffer.put((byte) p0);
+            mVertexByteBuffer.put((byte) p1);
+        }
+
+        public void createBufferObjects(GL gl) {
+            // Generate a the vertex and element buffer IDs
+            int[] vboIds = new int[2];
+            GL11 gl11 = (GL11) gl;
+            gl11.glGenBuffers(2, vboIds, 0);
+            mVertexBufferObjectId = vboIds[0];
+            mElementBufferObjectId = vboIds[1];
+
+            // Upload the vertex data
+            gl11.glBindBuffer(GL11.GL_ARRAY_BUFFER, mVertexBufferObjectId);
+            mVertexByteBuffer.position(0);
+            gl11.glBufferData(GL11.GL_ARRAY_BUFFER, mVertexByteBuffer.capacity(), mVertexByteBuffer, GL11.GL_STATIC_DRAW);
+
+            gl11.glBindBuffer(GL11.GL_ELEMENT_ARRAY_BUFFER, mElementBufferObjectId);
+            mIndexBuffer.position(0);
+            gl11.glBufferData(GL11.GL_ELEMENT_ARRAY_BUFFER, mIndexBuffer.capacity() * CHAR_SIZE, mIndexBuffer, GL11.GL_STATIC_DRAW);
+
+            // We don't need the in-memory data any more
+            mVertexBuffer = null;
+            mVertexByteBuffer = null;
+            mIndexBuffer = null;
+        }
+
+        public void draw(GL10 gl) {
+            GL11 gl11 = (GL11) gl;
+            GL11Ext gl11Ext = (GL11Ext) gl;
+
+            gl.glEnableClientState(GL10.GL_VERTEX_ARRAY);
+
+            gl11.glBindBuffer(GL11.GL_ARRAY_BUFFER, mVertexBufferObjectId);
+            gl11.glVertexPointer(3, GL10.GL_FLOAT, VERTEX_SIZE, 0);
+            gl11.glTexCoordPointer(2, GL10.GL_FLOAT, VERTEX_SIZE, VERTEX_TEXTURE_BUFFER_INDEX_OFFSET * FLOAT_SIZE);
+
+            gl.glEnableClientState(GL11Ext.GL_MATRIX_INDEX_ARRAY_OES);
+            gl.glEnableClientState(GL11Ext.GL_WEIGHT_ARRAY_OES);
+
+            gl11Ext.glWeightPointerOES(2, GL10.GL_FLOAT, VERTEX_SIZE, VERTEX_WEIGHT_BUFFER_INDEX_OFFSET  * FLOAT_SIZE);
+            gl11Ext.glMatrixIndexPointerOES(2, GL10.GL_UNSIGNED_BYTE, VERTEX_SIZE, VERTEX_PALETTE_INDEX_OFFSET );
+
+            gl11.glBindBuffer(GL11.GL_ELEMENT_ARRAY_BUFFER, mElementBufferObjectId);
+            gl11.glDrawElements(GL10.GL_TRIANGLES, mIndexCount, GL10.GL_UNSIGNED_SHORT, 0);
+            gl.glDisableClientState(GL10.GL_VERTEX_ARRAY);
+            gl.glDisableClientState(GL11Ext.GL_MATRIX_INDEX_ARRAY_OES);
+            gl.glDisableClientState(GL11Ext.GL_WEIGHT_ARRAY_OES);
+            gl11.glBindBuffer(GL11.GL_ARRAY_BUFFER, 0);
+            gl11.glBindBuffer(GL11.GL_ELEMENT_ARRAY_BUFFER, 0);
+        }
+    }
+
+    public MatrixPaletteRenderer(Context context) {
+        mContext = context;
+    }
+
+    public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+        /*
+         * By default, OpenGL enables features that improve quality
+         * but reduce performance. One might want to tweak that
+         * especially on software renderer.
+         */
+        gl.glDisable(GL10.GL_DITHER);
+
+        /*
+         * Some one-time OpenGL initialization can be made here
+         * probably based on features of this particular context
+         */
+        gl.glHint(GL10.GL_PERSPECTIVE_CORRECTION_HINT,
+                GL10.GL_FASTEST);
+
+        gl.glClearColor(.5f, .5f, .5f, 1);
+        gl.glShadeModel(GL10.GL_SMOOTH);
+        gl.glEnable(GL10.GL_DEPTH_TEST);
+        gl.glEnable(GL10.GL_TEXTURE_2D);
+
+        /*
+         * Create our texture. This has to be done each time the
+         * surface is created.
+         */
+
+        int[] textures = new int[1];
+        gl.glGenTextures(1, textures, 0);
+
+        mTextureID = textures[0];
+        gl.glBindTexture(GL10.GL_TEXTURE_2D, mTextureID);
+
+        gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_MIN_FILTER,
+                GL10.GL_NEAREST);
+        gl.glTexParameterf(GL10.GL_TEXTURE_2D,
+                GL10.GL_TEXTURE_MAG_FILTER,
+                GL10.GL_LINEAR);
+
+        gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_S,
+                GL10.GL_CLAMP_TO_EDGE);
+        gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_T,
+                GL10.GL_CLAMP_TO_EDGE);
+
+        gl.glTexEnvf(GL10.GL_TEXTURE_ENV, GL10.GL_TEXTURE_ENV_MODE,
+                GL10.GL_REPLACE);
+
+        InputStream is = mContext.getResources()
+                .openRawResource(R.raw.robot);
+        Bitmap bitmap;
+        try {
+            bitmap = BitmapFactory.decodeStream(is);
+        } finally {
+            try {
+                is.close();
+            } catch(IOException e) {
+                // Ignore.
+            }
+        }
+
+        GLUtils.texImage2D(GL10.GL_TEXTURE_2D, 0, bitmap, 0);
+        bitmap.recycle();
+
+        mGrid = generateWeightedGrid(gl);
+    }
+
+    public void onDrawFrame(GL10 gl) {
+        /*
+         * By default, OpenGL enables features that improve quality
+         * but reduce performance. One might want to tweak that
+         * especially on software renderer.
+         */
+        gl.glDisable(GL10.GL_DITHER);
+
+        gl.glTexEnvx(GL10.GL_TEXTURE_ENV, GL10.GL_TEXTURE_ENV_MODE,
+                GL10.GL_MODULATE);
+
+        /*
+         * Usually, the first thing one might want to do is to clear
+         * the screen. The most efficient way of doing this is to use
+         * glClear().
+         */
+
+        gl.glClear(GL10.GL_COLOR_BUFFER_BIT | GL10.GL_DEPTH_BUFFER_BIT);
+
+        gl.glEnable(GL10.GL_DEPTH_TEST);
+
+        gl.glEnable(GL10.GL_CULL_FACE);
+
+        /*
+         * Now we're ready to draw some 3D objects
+         */
+
+        gl.glMatrixMode(GL10.GL_MODELVIEW);
+        gl.glLoadIdentity();
+
+        GLU.gluLookAt(gl, 0, 0, -5, 0f, 0f, 0f, 0f, 1.0f, 0.0f);
+
+        gl.glEnableClientState(GL10.GL_VERTEX_ARRAY);
+        gl.glEnableClientState(GL10.GL_TEXTURE_COORD_ARRAY);
+
+        gl.glActiveTexture(GL10.GL_TEXTURE0);
+        gl.glBindTexture(GL10.GL_TEXTURE_2D, mTextureID);
+        gl.glTexParameterx(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_S,
+                GL10.GL_REPEAT);
+        gl.glTexParameterx(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_T,
+                GL10.GL_REPEAT);
+
+        long time = SystemClock.uptimeMillis() % 4000L;
+
+        // Rock back and forth
+        double animationUnit = ((double) time) / 4000;
+        float unitAngle = (float) Math.cos(animationUnit * 2 * Math.PI);
+        float angle = unitAngle * 135f;
+
+        gl.glEnable(GL11Ext.GL_MATRIX_PALETTE_OES);
+        gl.glMatrixMode(GL11Ext.GL_MATRIX_PALETTE_OES);
+
+        GL11Ext gl11Ext = (GL11Ext) gl;
+
+        // matrix 0: no transformation
+        gl11Ext.glCurrentPaletteMatrixOES(0);
+        gl11Ext.glLoadPaletteFromModelViewMatrixOES();
+
+
+        // matrix 1: rotate by "angle"
+        gl.glRotatef(angle, 0, 0, 1.0f);
+
+        gl11Ext.glCurrentPaletteMatrixOES(1);
+        gl11Ext.glLoadPaletteFromModelViewMatrixOES();
+
+        mGrid.draw(gl);
+
+        gl.glDisable(GL11Ext.GL_MATRIX_PALETTE_OES);
+    }
+
+    public void onSurfaceChanged(GL10 gl, int w, int h) {
+        gl.glViewport(0, 0, w, h);
+
+        /*
+        * Set our projection matrix. This doesn't have to be done
+        * each time we draw, but usually a new projection needs to
+        * be set when the viewport is resized.
+        */
+
+        float ratio = (float) w / h;
+        gl.glMatrixMode(GL10.GL_PROJECTION);
+        gl.glLoadIdentity();
+        gl.glFrustumf(-ratio, ratio, -1, 1, 3, 7);
+    }
+
+    private Grid generateWeightedGrid(GL gl) {
+        final int uSteps = 20;
+        final int vSteps = 20;
+
+        float radius = 0.25f;
+        float height = 2.0f;
+        Grid grid = new Grid(uSteps + 1, vSteps + 1);
+
+        for (int j = 0; j <= vSteps; j++) {
+            for (int i = 0; i <= uSteps; i++) {
+                double angle = Math.PI * 2 * i / uSteps;
+                float x = radius * (float) Math.cos(angle);
+                float y = height * ((float) j / vSteps - 0.5f);
+                float z = radius * (float) Math.sin(angle);
+                float u = -4.0f * (float) i / uSteps;
+                float v = -4.0f * (float) j / vSteps;
+                float w0 = (float) j / vSteps;
+                float w1 = 1.0f - w0;
+                grid.set(i, j, x, y, z, u, v, w0, w1, 0, 1);
+            }
+        }
+
+        grid.createBufferObjects(gl);
+        return grid;
+    }
+}

From 2c0f89aaf61d62ac2f28ff3e46db6ba27983c6e5 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Wed, 9 Dec 2009 00:13:05 -0800
Subject: [PATCH 07/17] Update SampleBrowserPlugin to show handling long press
 and double tap events.

---
 .../jni/background/BackgroundPlugin.cpp            | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp b/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp
index f79d9ac14..699fa4da3 100644
--- a/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp
+++ b/samples/BrowserPlugin/jni/background/BackgroundPlugin.cpp
@@ -72,6 +72,13 @@ BackgroundPlugin::BackgroundPlugin(NPP inst) : SurfaceSubPlugin(inst) {
     test_domAccess();
     test_javascript();
     test_loadJavaClass();
+
+    //register for touch events
+    ANPEventFlags flags = kTouch_ANPEventFlag;
+    NPError err = browser->setvalue(inst, kAcceptEvents_ANPSetValue, &flags);
+    if (err != NPERR_NO_ERROR) {
+        gLogI.log(kError_ANPLogType, "Error selecting input events.");
+    }
 }
 
 BackgroundPlugin::~BackgroundPlugin() {
@@ -170,7 +177,12 @@ int16 BackgroundPlugin::handleEvent(const ANPEvent* evt) {
             }
             break;
         case kTouch_ANPEventType:
-            gLogI.log(kError_ANPLogType, " ------ %p the plugin did not request touch events", inst());
+            if (kDown_ANPTouchAction == evt->data.touch.action)
+                return kHandleLongPress_ANPTouchResult | kHandleDoubleTap_ANPTouchResult;
+            else if (kLongPress_ANPTouchAction == evt->data.touch.action)
+                browser->geturl(inst(), "javascript:alert('Detected long press event.')", 0);
+            else if (kDoubleTap_ANPTouchAction == evt->data.touch.action)
+                browser->geturl(inst(), "javascript:alert('Detected double tap event.')", 0);
             break;
         case kKey_ANPEventType:
             gLogI.log(kError_ANPLogType, " ------ %p the plugin did not request key events", inst());

From 807dc15b095139d806eab5c9d4de4fbf692ed447 Mon Sep 17 00:00:00 2001
From: Trevor Johns <tjohns@google.com>
Date: Mon, 7 Dec 2009 17:04:53 -0800
Subject: [PATCH 08/17] Importing Wikitionary/SimpleWiktionary sample code from
 http://code.google.com/p/wiktionary-android/.

Original code by Jeffrey Sharkey <jsharkey@android.com>.

Modifications:

- Remove .classpath, .project, and default.properties.
- Remove generated files (/gen).
- Create Android.mk and _index.html.
- Cleaned up whitespace and converted to match AOSP style guide.
- Renamed SimpleWiktionary to WiktionarySimple to keep both samples next to each other in the
  directory listing.
- Removed the android:text attribute in the BulletPoint due to localization issues.
---
 samples/Wiktionary/Android.mk                 |  16 +
 samples/Wiktionary/AndroidManifest.xml        |  70 ++++
 samples/Wiktionary/_index.html                |  10 +
 samples/Wiktionary/res/anim/slide_in.xml      |  22 ++
 samples/Wiktionary/res/anim/slide_out.xml     |  22 ++
 samples/Wiktionary/res/drawable/app_icon.png  | Bin 0 -> 1985 bytes
 .../res/drawable/ic_menu_shuffle.png          | Bin 0 -> 2384 bytes
 .../res/drawable/logo_overlay.9.png           | Bin 0 -> 16911 bytes
 samples/Wiktionary/res/drawable/lookup_bg.xml |  20 +
 .../Wiktionary/res/drawable/progress_spin.xml |  43 +++
 samples/Wiktionary/res/drawable/star_logo.png | Bin 0 -> 2747 bytes
 samples/Wiktionary/res/drawable/widget_bg.xml |  22 ++
 .../res/drawable/widget_bg_normal.9.png       | Bin 0 -> 268 bytes
 .../res/drawable/widget_bg_pressed.9.png      | Bin 0 -> 275 bytes
 .../res/drawable/widget_bg_selected.9.png     | Bin 0 -> 276 bytes
 samples/Wiktionary/res/layout/about.xml       |  40 ++
 samples/Wiktionary/res/layout/lookup.xml      |  56 +++
 .../Wiktionary/res/layout/widget_message.xml  |  34 ++
 samples/Wiktionary/res/layout/widget_word.xml |  79 ++++
 samples/Wiktionary/res/menu/lookup.xml        |  34 ++
 samples/Wiktionary/res/values/strings.xml     |  56 +++
 samples/Wiktionary/res/values/styles.xml      |  66 ++++
 samples/Wiktionary/res/values/themes.xml      |  21 ++
 samples/Wiktionary/res/xml/searchable.xml     |  19 +
 samples/Wiktionary/res/xml/widget_word.xml    |  21 ++
 .../wiktionary/ExtendedWikiHelper.java        | 278 ++++++++++++++
 .../android/wiktionary/LookupActivity.java    | 344 ++++++++++++++++++
 .../android/wiktionary/SimpleWikiHelper.java  | 208 +++++++++++
 .../android/wiktionary/WordWidget.java        | 129 +++++++
 samples/WiktionarySimple/Android.mk           |  16 +
 samples/WiktionarySimple/AndroidManifest.xml  |  41 +++
 samples/WiktionarySimple/_index.html          |  10 +
 .../res/drawable/app_icon.png                 | Bin 0 -> 1985 bytes
 .../res/drawable/star_logo.png                | Bin 0 -> 2747 bytes
 .../res/drawable/widget_bg.xml                |  23 ++
 .../res/drawable/widget_bg_normal.9.png       | Bin 0 -> 268 bytes
 .../res/drawable/widget_bg_pressed.9.png      | Bin 0 -> 275 bytes
 .../res/drawable/widget_bg_selected.9.png     | Bin 0 -> 276 bytes
 .../res/layout/widget_message.xml             |  34 ++
 .../res/layout/widget_word.xml                |  79 ++++
 .../WiktionarySimple/res/values/strings.xml   |  44 +++
 .../WiktionarySimple/res/values/styles.xml    |  52 +++
 .../WiktionarySimple/res/xml/widget_word.xml  |  21 ++
 .../simplewiktionary/SimpleWikiHelper.java    | 214 +++++++++++
 .../android/simplewiktionary/WordWidget.java  | 127 +++++++
 45 files changed, 2271 insertions(+)
 create mode 100644 samples/Wiktionary/Android.mk
 create mode 100644 samples/Wiktionary/AndroidManifest.xml
 create mode 100644 samples/Wiktionary/_index.html
 create mode 100644 samples/Wiktionary/res/anim/slide_in.xml
 create mode 100644 samples/Wiktionary/res/anim/slide_out.xml
 create mode 100644 samples/Wiktionary/res/drawable/app_icon.png
 create mode 100755 samples/Wiktionary/res/drawable/ic_menu_shuffle.png
 create mode 100644 samples/Wiktionary/res/drawable/logo_overlay.9.png
 create mode 100644 samples/Wiktionary/res/drawable/lookup_bg.xml
 create mode 100644 samples/Wiktionary/res/drawable/progress_spin.xml
 create mode 100644 samples/Wiktionary/res/drawable/star_logo.png
 create mode 100644 samples/Wiktionary/res/drawable/widget_bg.xml
 create mode 100644 samples/Wiktionary/res/drawable/widget_bg_normal.9.png
 create mode 100644 samples/Wiktionary/res/drawable/widget_bg_pressed.9.png
 create mode 100644 samples/Wiktionary/res/drawable/widget_bg_selected.9.png
 create mode 100644 samples/Wiktionary/res/layout/about.xml
 create mode 100644 samples/Wiktionary/res/layout/lookup.xml
 create mode 100644 samples/Wiktionary/res/layout/widget_message.xml
 create mode 100644 samples/Wiktionary/res/layout/widget_word.xml
 create mode 100644 samples/Wiktionary/res/menu/lookup.xml
 create mode 100644 samples/Wiktionary/res/values/strings.xml
 create mode 100644 samples/Wiktionary/res/values/styles.xml
 create mode 100644 samples/Wiktionary/res/values/themes.xml
 create mode 100644 samples/Wiktionary/res/xml/searchable.xml
 create mode 100644 samples/Wiktionary/res/xml/widget_word.xml
 create mode 100644 samples/Wiktionary/src/com/example/android/wiktionary/ExtendedWikiHelper.java
 create mode 100644 samples/Wiktionary/src/com/example/android/wiktionary/LookupActivity.java
 create mode 100644 samples/Wiktionary/src/com/example/android/wiktionary/SimpleWikiHelper.java
 create mode 100644 samples/Wiktionary/src/com/example/android/wiktionary/WordWidget.java
 create mode 100644 samples/WiktionarySimple/Android.mk
 create mode 100644 samples/WiktionarySimple/AndroidManifest.xml
 create mode 100644 samples/WiktionarySimple/_index.html
 create mode 100644 samples/WiktionarySimple/res/drawable/app_icon.png
 create mode 100644 samples/WiktionarySimple/res/drawable/star_logo.png
 create mode 100644 samples/WiktionarySimple/res/drawable/widget_bg.xml
 create mode 100644 samples/WiktionarySimple/res/drawable/widget_bg_normal.9.png
 create mode 100644 samples/WiktionarySimple/res/drawable/widget_bg_pressed.9.png
 create mode 100644 samples/WiktionarySimple/res/drawable/widget_bg_selected.9.png
 create mode 100644 samples/WiktionarySimple/res/layout/widget_message.xml
 create mode 100644 samples/WiktionarySimple/res/layout/widget_word.xml
 create mode 100644 samples/WiktionarySimple/res/values/strings.xml
 create mode 100644 samples/WiktionarySimple/res/values/styles.xml
 create mode 100644 samples/WiktionarySimple/res/xml/widget_word.xml
 create mode 100644 samples/WiktionarySimple/src/com/example/android/simplewiktionary/SimpleWikiHelper.java
 create mode 100644 samples/WiktionarySimple/src/com/example/android/simplewiktionary/WordWidget.java

diff --git a/samples/Wiktionary/Android.mk b/samples/Wiktionary/Android.mk
new file mode 100644
index 000000000..d6ce1f16c
--- /dev/null
+++ b/samples/Wiktionary/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := samples
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := Wiktionary
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
+
+# Use the following include to make our test apk.
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/samples/Wiktionary/AndroidManifest.xml b/samples/Wiktionary/AndroidManifest.xml
new file mode 100644
index 000000000..1641a8b0a
--- /dev/null
+++ b/samples/Wiktionary/AndroidManifest.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.wiktionary"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:icon="@drawable/app_icon" android:label="@string/app_name"
+        android:description="@string/app_descrip">
+
+        <!-- Browser-like Activity to navigate dictionary definitions  -->
+        <activity
+            android:name=".LookupActivity"
+            android:theme="@style/LookupTheme"
+            android:launchMode="singleTop"
+            android:configChanges="orientation|keyboardHidden">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="wiktionary" android:host="lookup" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
+            <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
+        </activity>
+
+        <!-- Broadcast Receiver that will process AppWidget updates -->
+        <receiver android:name=".WordWidget" android:label="@string/widget_name">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                android:resource="@xml/widget_word" />
+        </receiver>
+
+        <!-- Service to perform web API queries -->
+        <service android:name=".WordWidget$UpdateService" />
+
+    </application>
+
+    <meta-data android:name="android.app.default_searchable" android:value=".LookupActivity" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4" />
+
+</manifest>
diff --git a/samples/Wiktionary/_index.html b/samples/Wiktionary/_index.html
new file mode 100644
index 000000000..eb7cb96bb
--- /dev/null
+++ b/samples/Wiktionary/_index.html
@@ -0,0 +1,10 @@
+<p>A sample application that demonstrates how to create an interactive widget
+for display on the Android home screen.</p>
+
+<p>When installed, this adds a "Wiktionary" option to the widget installation
+menu. The word of the day is downloaded from Wiktionary and displayed in a
+frame. Touching the widget will open a custom WebView to render the
+definition.</p>
+
+<img alt="" src="../images/wiktionary.png"/>
+<img alt="" src="../images/wiktionary_detail.png"/>
diff --git a/samples/Wiktionary/res/anim/slide_in.xml b/samples/Wiktionary/res/anim/slide_in.xml
new file mode 100644
index 000000000..3da074e09
--- /dev/null
+++ b/samples/Wiktionary/res/anim/slide_in.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:fillAfter="true">
+    <translate
+        android:fromXDelta="-26"
+        android:toXDelta="0"
+        android:duration="400" />
+</set>
diff --git a/samples/Wiktionary/res/anim/slide_out.xml b/samples/Wiktionary/res/anim/slide_out.xml
new file mode 100644
index 000000000..ec21f521e
--- /dev/null
+++ b/samples/Wiktionary/res/anim/slide_out.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:fillAfter="true">
+    <translate
+        android:fromXDelta="0"
+        android:toXDelta="-26"
+        android:duration="400" />
+</set>
diff --git a/samples/Wiktionary/res/drawable/app_icon.png b/samples/Wiktionary/res/drawable/app_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b1417aad99e1ecf3376d795c9f76eb61d83202b
GIT binary patch
literal 1985
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
TZnFlg00000NkvXXu0mjfX5y*S

literal 0
HcmV?d00001

diff --git a/samples/Wiktionary/res/drawable/ic_menu_shuffle.png b/samples/Wiktionary/res/drawable/ic_menu_shuffle.png
new file mode 100755
index 0000000000000000000000000000000000000000..cb7009deaa2c13f10987565fad4c9e1ebe66c5aa
GIT binary patch
literal 2384
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
C=bIn^

literal 0
HcmV?d00001

diff --git a/samples/Wiktionary/res/drawable/logo_overlay.9.png b/samples/Wiktionary/res/drawable/logo_overlay.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..851ceb15b882b7a24be0e8fa0cedf9a54eff467b
GIT binary patch
literal 16911
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
UT?P;EZVeEaqT2In1&h%C2lWtEaR2}S

literal 0
HcmV?d00001

diff --git a/samples/Wiktionary/res/drawable/lookup_bg.xml b/samples/Wiktionary/res/drawable/lookup_bg.xml
new file mode 100644
index 000000000..46d76eb9b
--- /dev/null
+++ b/samples/Wiktionary/res/drawable/lookup_bg.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+    <item android:drawable="@drawable/logo_overlay" />
+</layer-list>
diff --git a/samples/Wiktionary/res/drawable/progress_spin.xml b/samples/Wiktionary/res/drawable/progress_spin.xml
new file mode 100644
index 000000000..4594a181b
--- /dev/null
+++ b/samples/Wiktionary/res/drawable/progress_spin.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:fromDegrees="0"
+        android:toDegrees="360">
+
+    <shape
+        android:shape="ring"
+        android:innerRadiusRatio="4"
+        android:thicknessRatio="5.333"
+        android:useLevel="false">
+
+        <size
+            android:width="18dip"
+            android:height="18dip" />
+
+        <gradient
+            android:type="sweep"
+            android:useLevel="false"
+            android:startColor="#006688cc"
+            android:centerColor="#886688cc"
+            android:endColor="#ff6688cc"
+            android:centerY="0.50" />
+
+    </shape>
+
+</rotate>
diff --git a/samples/Wiktionary/res/drawable/star_logo.png b/samples/Wiktionary/res/drawable/star_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b32d1756ccde3f84a26d989b45a8af70a7b60d04
GIT binary patch
literal 2747
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
BACUk6

literal 0
HcmV?d00001

diff --git a/samples/Wiktionary/res/drawable/widget_bg.xml b/samples/Wiktionary/res/drawable/widget_bg.xml
new file mode 100644
index 000000000..c2b846277
--- /dev/null
+++ b/samples/Wiktionary/res/drawable/widget_bg.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_window_focused="false" android:drawable="@drawable/widget_bg_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/widget_bg_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/widget_bg_selected" />
+    <item android:drawable="@drawable/widget_bg_normal" />
+</selector>
diff --git a/samples/Wiktionary/res/drawable/widget_bg_normal.9.png b/samples/Wiktionary/res/drawable/widget_bg_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..314eb8ef96947d191ce4920c3d312da92fc65767
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9a!3HF~Pw#sVq!^2X+?^QKos)S9<gg`qySp&_
z2f+n<mrn+Ya29w(76Y|k2Vq7hjoB4ILG}_)Usv{<EWBcZ0xM3Hz5xpLc)B=-Se#By
zP~iQOzQFLuc^BQuZoE=mY#SAd!`|-OJzwN(;<{6PA?1R~S5yuD)d_vIc8dKrpLJHf
z#Kq8v*;)n$hE6U2|NcLJ;K+#+AKw43Z(F=vUVu+|N<>0RN<vc8tpELthyJ-Qk4QeE
zR`}ye?W99h6VyE-O88cEZ(uVCVsbq%^gsOVzSAA9a~K)^oKkptcd3~a&|M6ku6{1-
HoD!M<qgZ7I

literal 0
HcmV?d00001

diff --git a/samples/Wiktionary/res/drawable/widget_bg_pressed.9.png b/samples/Wiktionary/res/drawable/widget_bg_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc23e787b739f651bf5bd0333c6e022e89c25645
GIT binary patch
literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9a!3HF~Pw#sVq!^2X+?^QKos)S9<gg`qySp&_
z2f+n<mrn+Ya29w(76Y|k2Vq7hjoB4ILG}_)Usv{<EWBbu;<C+~dw@cdJzX3_EKVmU
zDDeJCUtsv-yo>H+H(seOwv7tK_w>@#H4kzg|Ch3)w>#|ZKJJHmFDQ8$`^3*!ZN$uN
z^50;Q_OFM(-!cd*yZpHS|38mUPY=)kfB(}T+&J^p!JsD~sd3`O#!k+xfA(w~zvbs9
z^$N~rxvl2ME_5bQ<_Txf`Xi>t7|R8f_qDX~9g3OyfBmi6>4M!B%nU!cm2Iu7dYysJ
OWAJqKb6Mw<&;$T6n`1}-

literal 0
HcmV?d00001

diff --git a/samples/Wiktionary/res/drawable/widget_bg_selected.9.png b/samples/Wiktionary/res/drawable/widget_bg_selected.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef0cdc066a526eeeb7ba760d907115a2d1c0c26a
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9a!3HF~Pw#sVq!^2X+?^QKos)S9<gg`qySp&_
z2f+n<mrn+Ya29w(76Y|k2Vq7hjoB4ILG}_)Usv{<EWBbuj4#94?gE9Tc)B=-Se#By
zP~iQOzQFLuc^BQuZoE=mY#SAd<HAl%obup^wVdIlW3H>q?zevUW;JPv<TCv;p)(s<
zXVptw6#ct$M}0%5pwgfB|LfV*+}zsg|Nl4MP@-Waz@t1RA|WLuA*pHB|9-|p|J;{H
zBp=Cg-rdB!E4LyiRptrjrv;zujxm-CD(`D)<2w{H_5b=?wbKQ=EtnZLOi<R9;}!V>
PbRUDKtDnm{r-UW|1UqF4

literal 0
HcmV?d00001

diff --git a/samples/Wiktionary/res/layout/about.xml b/samples/Wiktionary/res/layout/about.xml
new file mode 100644
index 000000000..3b25b3274
--- /dev/null
+++ b/samples/Wiktionary/res/layout/about.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="20dip">
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:text="@string/app_descrip"
+        android:textColor="?android:attr/textColorPrimaryInverse" />
+
+    <TextView
+        android:id="@+id/about_credits"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="20dip"
+        android:textSize="16sp"
+        android:text="@string/app_credits"
+        android:autoLink="web"
+        android:textColor="?android:attr/textColorPrimaryInverse" />
+
+</LinearLayout>
diff --git a/samples/Wiktionary/res/layout/lookup.xml b/samples/Wiktionary/res/layout/lookup.xml
new file mode 100644
index 000000000..43cffaa1a
--- /dev/null
+++ b/samples/Wiktionary/res/layout/lookup.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:id="@+id/title_bar"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+
+        <ProgressBar
+            android:id="@+id/progress"
+            android:layout_width="18dip"
+            android:layout_height="18dip"
+            android:layout_marginLeft="10dip"
+            android:visibility="invisible"
+            android:indeterminateOnly="true"
+            android:indeterminateDrawable="@drawable/progress_spin"
+            android:indeterminateBehavior="repeat"
+            android:indeterminateDuration="3500" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="10dip"
+            style="@style/LookupTitle" />
+
+    </LinearLayout>
+
+    <WebView
+        android:id="@+id/webview"
+        android:layout_width="fill_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+</LinearLayout>
diff --git a/samples/Wiktionary/res/layout/widget_message.xml b/samples/Wiktionary/res/layout/widget_message.xml
new file mode 100644
index 000000000..ba9471447
--- /dev/null
+++ b/samples/Wiktionary/res/layout/widget_message.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    style="@style/WidgetBackground">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dip"
+        android:padding="10dip"
+        android:gravity="center"
+        android:text="@string/widget_loading"
+        style="@style/Text.Loading" />
+
+</LinearLayout>
diff --git a/samples/Wiktionary/res/layout/widget_word.xml b/samples/Wiktionary/res/layout/widget_word.xml
new file mode 100644
index 000000000..0e76f0b80
--- /dev/null
+++ b/samples/Wiktionary/res/layout/widget_word.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:focusable="true"
+    style="@style/WidgetBackground">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:src="@drawable/star_logo" />
+
+    <TextView
+        android:id="@+id/word_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="14dip"
+        android:layout_marginBottom="1dip"
+        android:includeFontPadding="false"
+        android:singleLine="true"
+        android:ellipsize="end"
+        style="@style/Text.WordTitle" />
+
+    <TextView
+        android:id="@+id/word_type"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/word_title"
+        android:layout_toLeftOf="@id/icon"
+        android:layout_alignBaseline="@id/word_title"
+        android:paddingLeft="4dip"
+        android:includeFontPadding="false"
+        android:singleLine="true"
+        android:ellipsize="end"
+        style="@style/Text.WordType" />
+
+    <TextView
+        android:id="@+id/bullet"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/word_title"
+        android:paddingRight="4dip"
+        android:includeFontPadding="false"
+        android:singleLine="true"
+        style="@style/BulletPoint" />
+
+    <TextView
+        android:id="@+id/definition"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/word_title"
+        android:layout_toRightOf="@id/bullet"
+        android:paddingRight="5dip"
+        android:paddingBottom="4dip"
+        android:includeFontPadding="false"
+        android:lineSpacingMultiplier="0.9"
+        android:maxLines="4"
+        android:fadingEdge="vertical"
+        style="@style/Text.Definition" />
+
+</RelativeLayout>
diff --git a/samples/Wiktionary/res/menu/lookup.xml b/samples/Wiktionary/res/menu/lookup.xml
new file mode 100644
index 000000000..741ca9ab2
--- /dev/null
+++ b/samples/Wiktionary/res/menu/lookup.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/lookup_search"
+        android:title="@string/lookup_search"
+        android:icon="@android:drawable/ic_menu_search" />
+
+    <item
+        android:id="@+id/lookup_random"
+        android:title="@string/lookup_random"
+        android:icon="@drawable/ic_menu_shuffle" />
+
+    <item
+        android:id="@+id/lookup_about"
+        android:title="@string/lookup_about"
+        android:icon="@android:drawable/ic_menu_help" />
+
+</menu>
diff --git a/samples/Wiktionary/res/values/strings.xml b/samples/Wiktionary/res/values/strings.xml
new file mode 100644
index 000000000..38d993768
--- /dev/null
+++ b/samples/Wiktionary/res/values/strings.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string name="app_name">Wiktionary example</string>
+    <string name="app_descrip">Example of a fast Wiktionary browser and Word-of-day widget</string>
+    <string name="app_credits">"All dictionary content provided by Wiktionary under a GFDL license.  http://en.wiktionary.org\n\nIcon derived from Tango Desktop Project under a public domain license.  http://tango.freedesktop.org"</string>
+
+    <string name="template_user_agent">"%s/%s (Linux; Android)"</string>
+    <string name="template_wotd_title">"Wiktionary:Word of the day/%s %s"</string>
+    <string name="template_define_url">"http://en.wiktionary.org/wiki/%s"</string>
+
+    <string name="widget_name">Wiktionary</string>
+
+    <string name="widget_loading">"Loading word\nof day\u2026"</string>
+    <string name="widget_error">No word of day found</string>
+
+    <string-array name="month_names">
+        <item>January</item>
+        <item>February</item>
+        <item>March</item>
+        <item>April</item>
+        <item>May</item>
+        <item>June</item>
+        <item>July</item>
+        <item>August</item>
+        <item>September</item>
+        <item>October</item>
+        <item>November</item>
+        <item>December</item>
+    </string-array>
+
+
+    <string name="search_label">Wiktionary search</string>
+    <string name="search_hint">Define word</string>
+
+    <string name="lookup_search">Search</string>
+    <string name="lookup_random">Random</string>
+    <string name="lookup_about">About</string>
+
+    <string name="empty_result">No entry found for this word, or problem reading data.</string>
+
+</resources>
diff --git a/samples/Wiktionary/res/values/styles.xml b/samples/Wiktionary/res/values/styles.xml
new file mode 100644
index 000000000..45fc8f5a4
--- /dev/null
+++ b/samples/Wiktionary/res/values/styles.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+
+    <style name="WidgetBackground">
+        <item name="android:background">@drawable/widget_bg</item>
+    </style>
+
+    <style name="BulletPoint">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="Text" />
+
+    <style name="Text.Loading">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="Text.WordTitle">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="Text.WordType">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">italic</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="Text.Definition">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+
+    <style name="LookupProgress">
+        <item name="android:indeterminateOnly">true</item>
+        <item name="android:indeterminateDrawable">@drawable/progress_spin</item>
+        <item name="android:indeterminateBehavior">repeat</item>
+        <item name="android:indeterminateDuration">3500</item>
+    </style>
+
+    <style name="LookupTitle">
+        <item name="android:textSize">30sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+</resources>
diff --git a/samples/Wiktionary/res/values/themes.xml b/samples/Wiktionary/res/values/themes.xml
new file mode 100644
index 000000000..c4d7630f6
--- /dev/null
+++ b/samples/Wiktionary/res/values/themes.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <style name="LookupTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">@drawable/lookup_bg</item>
+    </style>
+</resources>
diff --git a/samples/Wiktionary/res/xml/searchable.xml b/samples/Wiktionary/res/xml/searchable.xml
new file mode 100644
index 000000000..02ee31fc5
--- /dev/null
+++ b/samples/Wiktionary/res/xml/searchable.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/search_label"
+    android:hint="@string/search_hint" />
diff --git a/samples/Wiktionary/res/xml/widget_word.xml b/samples/Wiktionary/res/xml/widget_word.xml
new file mode 100644
index 000000000..46d31c321
--- /dev/null
+++ b/samples/Wiktionary/res/xml/widget_word.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="146dip"
+    android:minHeight="72dip"
+    android:updatePeriodMillis="86400000"
+    android:initialLayout="@layout/widget_message" />
diff --git a/samples/Wiktionary/src/com/example/android/wiktionary/ExtendedWikiHelper.java b/samples/Wiktionary/src/com/example/android/wiktionary/ExtendedWikiHelper.java
new file mode 100644
index 000000000..3a3917248
--- /dev/null
+++ b/samples/Wiktionary/src/com/example/android/wiktionary/ExtendedWikiHelper.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.wiktionary;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.net.Uri;
+import android.text.TextUtils;
+import android.webkit.WebView;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Extended version of {@link SimpleWikiHelper}. This version adds methods to
+ * pick a random word, and to format generic wiki-style text into HTML.
+ */
+public class ExtendedWikiHelper extends SimpleWikiHelper {
+    /**
+     * HTML style sheet to include with any {@link #formatWikiText(String)} HTML
+     * results. It formats nicely for a mobile screen, and hides some content
+     * boxes to keep things tidy.
+     */
+    private static final String STYLE_SHEET = "<style>h2 {font-size:1.2em;font-weight:normal;} " +
+            "a {color:#6688cc;} ol {padding-left:1.5em;} blockquote {margin-left:0em;} " +
+            ".interProject, .noprint {display:none;} " +
+            "li, blockquote {margin-top:0.5em;margin-bottom:0.5em;}</style>";
+
+    /**
+     * Pattern of section titles we're interested in showing. This trims out
+     * extra sections that can clutter things up on a mobile screen.
+     */
+    private static final Pattern sValidSections =
+        Pattern.compile("(verb|noun|adjective|pronoun|interjection)", Pattern.CASE_INSENSITIVE);
+
+    /**
+     * Pattern that can be used to split a returned wiki page into its various
+     * sections. Doesn't treat children sections differently.
+     */
+    private static final Pattern sSectionSplit =
+        Pattern.compile("^=+(.+?)=+.+?(?=^=)", Pattern.MULTILINE | Pattern.DOTALL);
+
+    /**
+     * When picking random words in {@link #getRandomWord()}, we sometimes
+     * encounter special articles or templates. This pattern ignores any words
+     * like those, usually because they have ":" or other punctuation.
+     */
+    private static final Pattern sInvalidWord = Pattern.compile("[^A-Za-z0-9 ]");
+
+    /**
+     * {@link Uri} authority to use when creating internal links.
+     */
+    public static final String WIKI_AUTHORITY = "wiktionary";
+
+    /**
+     * {@link Uri} host to use when creating internal links.
+     */
+    public static final String WIKI_LOOKUP_HOST = "lookup";
+
+    /**
+     * Mime-type to use when showing parsed results in a {@link WebView}.
+     */
+    public static final String MIME_TYPE = "text/html";
+
+    /**
+     * Encoding to use when showing parsed results in a {@link WebView}.
+     */
+    public static final String ENCODING = "utf-8";
+
+    /**
+     * {@link Uri} to use when requesting a random page.
+     */
+    private static final String WIKTIONARY_RANDOM =
+        "http://en.wiktionary.org/w/api.php?action=query&list=random&format=json";
+
+    /**
+     * Fake section to insert at the bottom of a wiki response before parsing.
+     * This ensures that {@link #sSectionSplit} will always catch the last
+     * section, as it uses section headers in its searching.
+     */
+    private static final String STUB_SECTION = "\n=Stub section=";
+
+    /**
+     * Number of times to try finding a random word in {@link #getRandomWord()}.
+     * These failures are usually when the found word fails the
+     * {@link #sInvalidWord} test, or when a network error happens.
+     */
+    private static final int RANDOM_TRIES = 3;
+
+    /**
+     * Internal class to hold a wiki formatting rule. It's mostly a wrapper to
+     * simplify {@link Matcher#replaceAll(String)}.
+     */
+    private static class FormatRule {
+        private Pattern mPattern;
+        private String mReplaceWith;
+
+        /**
+         * Create a wiki formatting rule.
+         *
+         * @param pattern Search string to be compiled into a {@link Pattern}.
+         * @param replaceWith String to replace any found occurances with. This
+         *            string can also include back-references into the given
+         *            pattern.
+         * @param flags Any flags to compile the {@link Pattern} with.
+         */
+        public FormatRule(String pattern, String replaceWith, int flags) {
+            mPattern = Pattern.compile(pattern, flags);
+            mReplaceWith = replaceWith;
+        }
+
+        /**
+         * Create a wiki formatting rule.
+         *
+         * @param pattern Search string to be compiled into a {@link Pattern}.
+         * @param replaceWith String to replace any found occurances with. This
+         *            string can also include back-references into the given
+         *            pattern.
+         */
+        public FormatRule(String pattern, String replaceWith) {
+            this(pattern, replaceWith, 0);
+        }
+
+        /**
+         * Apply this formatting rule to the given input string, and return the
+         * resulting new string.
+         */
+        public String apply(String input) {
+            Matcher m = mPattern.matcher(input);
+            return m.replaceAll(mReplaceWith);
+        }
+
+    }
+
+    /**
+     * List of internal formatting rules to apply when parsing wiki text. These
+     * include indenting various bullets, apply italic and bold styles, and
+     * adding internal linking.
+     */
+    private static final List<FormatRule> sFormatRules = new ArrayList<FormatRule>();
+
+    static {
+        // Format header blocks and wrap outside content in ordered list
+        sFormatRules.add(new FormatRule("^=+(.+?)=+", "</ol><h2>$1</h2><ol>",
+                Pattern.MULTILINE));
+
+        // Indent quoted blocks, handle ordered and bullet lists
+        sFormatRules.add(new FormatRule("^#+\\*?:(.+?)$", "<blockquote>$1</blockquote>",
+                Pattern.MULTILINE));
+        sFormatRules.add(new FormatRule("^#+:?\\*(.+?)$", "<ul><li>$1</li></ul>",
+                Pattern.MULTILINE));
+        sFormatRules.add(new FormatRule("^#+(.+?)$", "<li>$1</li>",
+                Pattern.MULTILINE));
+
+        // Add internal links
+        sFormatRules.add(new FormatRule("\\[\\[([^:\\|\\]]+)\\]\\]",
+                String.format("<a href=\"%s://%s/$1\">$1</a>", WIKI_AUTHORITY, WIKI_LOOKUP_HOST)));
+        sFormatRules.add(new FormatRule("\\[\\[([^:\\|\\]]+)\\|([^\\]]+)\\]\\]",
+                String.format("<a href=\"%s://%s/$1\">$2</a>", WIKI_AUTHORITY, WIKI_LOOKUP_HOST)));
+
+        // Add bold and italic formatting
+        sFormatRules.add(new FormatRule("'''(.+?)'''", "<b>$1</b>"));
+        sFormatRules.add(new FormatRule("([^'])''([^'].*?[^'])''([^'])", "$1<i>$2</i>$3"));
+
+        // Remove odd category links and convert remaining links into flat text
+        sFormatRules.add(new FormatRule("(\\{+.+?\\}+|\\[\\[[^:]+:[^\\\\|\\]]+\\]\\]|" +
+                "\\[http.+?\\]|\\[\\[Category:.+?\\]\\])", "", Pattern.MULTILINE | Pattern.DOTALL));
+        sFormatRules.add(new FormatRule("\\[\\[([^\\|\\]]+\\|)?(.+?)\\]\\]", "$2",
+                Pattern.MULTILINE));
+
+    }
+
+    /**
+     * Query the Wiktionary API to pick a random dictionary word. Will try
+     * multiple times to find a valid word before giving up.
+     *
+     * @return Random dictionary word, or null if no valid word was found.
+     * @throws ApiException If any connection or server error occurs.
+     * @throws ParseException If there are problems parsing the response.
+     */
+    public static String getRandomWord() throws ApiException, ParseException {
+        // Keep trying a few times until we find a valid word
+        int tries = 0;
+        while (tries++ < RANDOM_TRIES) {
+            // Query the API for a random word
+            String content = getUrlContent(WIKTIONARY_RANDOM);
+            try {
+                // Drill into the JSON response to find the returned word
+                JSONObject response = new JSONObject(content);
+                JSONObject query = response.getJSONObject("query");
+                JSONArray random = query.getJSONArray("random");
+                JSONObject word = random.getJSONObject(0);
+                String foundWord = word.getString("title");
+
+                // If we found an actual word, and it wasn't rejected by our invalid
+                // filter, then accept and return it.
+                if (foundWord != null &&
+                        !sInvalidWord.matcher(foundWord).find()) {
+                    return foundWord;
+                }
+            } catch (JSONException e) {
+                throw new ParseException("Problem parsing API response", e);
+            }
+        }
+
+        // No valid word found in number of tries, so return null
+        return null;
+    }
+
+    /**
+     * Format the given wiki-style text into formatted HTML content. This will
+     * create headers, lists, internal links, and style formatting for any wiki
+     * markup found.
+     *
+     * @param wikiText The raw text to format, with wiki-markup included.
+     * @return HTML formatted content, ready for display in {@link WebView}.
+     */
+    public static String formatWikiText(String wikiText) {
+        if (wikiText == null) {
+            return null;
+        }
+
+        // Insert a fake last section into the document so our section splitter
+        // can correctly catch the last section.
+        wikiText = wikiText.concat(STUB_SECTION);
+
+        // Read through all sections, keeping only those matching our filter,
+        // and only including the first entry for each title.
+        HashSet<String> foundSections = new HashSet<String>();
+        StringBuilder builder = new StringBuilder();
+
+        Matcher sectionMatcher = sSectionSplit.matcher(wikiText);
+        while (sectionMatcher.find()) {
+            String title = sectionMatcher.group(1);
+            if (!foundSections.contains(title) &&
+                    sValidSections.matcher(title).matches()) {
+                String sectionContent = sectionMatcher.group();
+                foundSections.add(title);
+                builder.append(sectionContent);
+            }
+        }
+
+        // Our new wiki text is the selected sections only
+        wikiText = builder.toString();
+
+        // Apply all formatting rules, in order, to the wiki text
+        for (FormatRule rule : sFormatRules) {
+            wikiText = rule.apply(wikiText);
+        }
+
+        // Return the resulting HTML with style sheet, if we have content left
+        if (!TextUtils.isEmpty(wikiText)) {
+            return STYLE_SHEET + wikiText;
+        } else {
+            return null;
+        }
+    }
+
+}
diff --git a/samples/Wiktionary/src/com/example/android/wiktionary/LookupActivity.java b/samples/Wiktionary/src/com/example/android/wiktionary/LookupActivity.java
new file mode 100644
index 000000000..6cc231b8c
--- /dev/null
+++ b/samples/Wiktionary/src/com/example/android/wiktionary/LookupActivity.java
@@ -0,0 +1,344 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.wiktionary;
+
+import com.example.android.wiktionary.SimpleWikiHelper.ApiException;
+import com.example.android.wiktionary.SimpleWikiHelper.ParseException;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.SearchManager;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.text.TextUtils;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.view.animation.Animation.AnimationListener;
+import android.webkit.WebView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import java.util.Stack;
+
+/**
+ * Activity that lets users browse through Wiktionary content. This is just the
+ * user interface, and all API communication and parsing is handled in
+ * {@link ExtendedWikiHelper}.
+ */
+public class LookupActivity extends Activity implements AnimationListener {
+    private static final String TAG = "LookupActivity";
+
+    private View mTitleBar;
+    private TextView mTitle;
+    private ProgressBar mProgress;
+    private WebView mWebView;
+
+    private Animation mSlideIn;
+    private Animation mSlideOut;
+
+    /**
+     * History stack of previous words browsed in this session. This is
+     * referenced when the user taps the "back" key, to possibly intercept and
+     * show the last-visited entry, instead of closing the activity.
+     */
+    private Stack<String> mHistory = new Stack<String>();
+
+    private String mEntryTitle;
+
+    /**
+     * Keep track of last time user tapped "back" hard key. When pressed more
+     * than once within {@link #BACK_THRESHOLD}, we treat let the back key fall
+     * through and close the app.
+     */
+    private long mLastPress = -1;
+
+    private static final long BACK_THRESHOLD = DateUtils.SECOND_IN_MILLIS / 2;
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.lookup);
+
+        // Load animations used to show/hide progress bar
+        mSlideIn = AnimationUtils.loadAnimation(this, R.anim.slide_in);
+        mSlideOut = AnimationUtils.loadAnimation(this, R.anim.slide_out);
+
+        // Listen for the "in" animation so we make the progress bar visible
+        // only after the sliding has finished.
+        mSlideIn.setAnimationListener(this);
+
+        mTitleBar = findViewById(R.id.title_bar);
+        mTitle = (TextView) findViewById(R.id.title);
+        mProgress = (ProgressBar) findViewById(R.id.progress);
+        mWebView = (WebView) findViewById(R.id.webview);
+
+        // Make the view transparent to show background
+        mWebView.setBackgroundColor(0);
+
+        // Prepare User-Agent string for wiki actions
+        ExtendedWikiHelper.prepareUserAgent(this);
+
+        // Handle incoming intents as possible searches or links
+        onNewIntent(getIntent());
+    }
+
+    /**
+     * Intercept the back-key to try walking backwards along our word history
+     * stack. If we don't have any remaining history, the key behaves normally
+     * and closes this activity.
+     */
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        // Handle back key as long we have a history stack
+        if (keyCode == KeyEvent.KEYCODE_BACK && !mHistory.empty()) {
+
+            // Compare against last pressed time, and if user hit multiple times
+            // in quick succession, we should consider bailing out early.
+            long currentPress = SystemClock.uptimeMillis();
+            if (currentPress - mLastPress < BACK_THRESHOLD) {
+                return super.onKeyDown(keyCode, event);
+            }
+            mLastPress = currentPress;
+
+            // Pop last entry off stack and start loading
+            String lastEntry = mHistory.pop();
+            startNavigating(lastEntry, false);
+
+            return true;
+        }
+
+        // Otherwise fall through to parent
+        return super.onKeyDown(keyCode, event);
+    }
+
+    /**
+     * Start navigating to the given word, pushing any current word onto the
+     * history stack if requested. The navigation happens on a background thread
+     * and updates the GUI when finished.
+     *
+     * @param word The dictionary word to navigate to.
+     * @param pushHistory If true, push the current word onto history stack.
+     */
+    private void startNavigating(String word, boolean pushHistory) {
+        // Push any current word onto the history stack
+        if (!TextUtils.isEmpty(mEntryTitle) && pushHistory) {
+            mHistory.add(mEntryTitle);
+        }
+
+        // Start lookup for new word in background
+        new LookupTask().execute(word);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.lookup, menu);
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.lookup_search: {
+                onSearchRequested();
+                return true;
+            }
+            case R.id.lookup_random: {
+                startNavigating(null, true);
+                return true;
+            }
+            case R.id.lookup_about: {
+                showAbout();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Show an about dialog that cites data sources.
+     */
+    protected void showAbout() {
+        // Inflate the about message contents
+        View messageView = getLayoutInflater().inflate(R.layout.about, null, false);
+
+        // When linking text, force to always use default color. This works
+        // around a pressed color state bug.
+        TextView textView = (TextView) messageView.findViewById(R.id.about_credits);
+        int defaultColor = textView.getTextColors().getDefaultColor();
+        textView.setTextColor(defaultColor);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setIcon(R.drawable.app_icon);
+        builder.setTitle(R.string.app_name);
+        builder.setView(messageView);
+        builder.create();
+        builder.show();
+    }
+
+    /**
+     * Because we're singleTop, we handle our own new intents. These usually
+     * come from the {@link SearchManager} when a search is requested, or from
+     * internal links the user clicks on.
+     */
+    @Override
+    public void onNewIntent(Intent intent) {
+        final String action = intent.getAction();
+        if (Intent.ACTION_SEARCH.equals(action)) {
+            // Start query for incoming search request
+            String query = intent.getStringExtra(SearchManager.QUERY);
+            startNavigating(query, true);
+
+        } else if (Intent.ACTION_VIEW.equals(action)) {
+            // Treat as internal link only if valid Uri and host matches
+            Uri data = intent.getData();
+            if (data != null && ExtendedWikiHelper.WIKI_LOOKUP_HOST
+                    .equals(data.getHost())) {
+                String query = data.getPathSegments().get(0);
+                startNavigating(query, true);
+            }
+
+        } else {
+            // If not recognized, then start showing random word
+            startNavigating(null, true);
+        }
+    }
+
+    /**
+     * Set the title for the current entry.
+     */
+    protected void setEntryTitle(String entryText) {
+        mEntryTitle = entryText;
+        mTitle.setText(mEntryTitle);
+    }
+
+    /**
+     * Set the content for the current entry. This will update our
+     * {@link WebView} to show the requested content.
+     */
+    protected void setEntryContent(String entryContent) {
+        mWebView.loadDataWithBaseURL(ExtendedWikiHelper.WIKI_AUTHORITY, entryContent,
+                ExtendedWikiHelper.MIME_TYPE, ExtendedWikiHelper.ENCODING, null);
+    }
+
+    /**
+     * Background task to handle Wiktionary lookups. This correctly shows and
+     * hides the loading animation from the GUI thread before starting a
+     * background query to the Wiktionary API. When finished, it transitions
+     * back to the GUI thread where it updates with the newly-found entry.
+     */
+    private class LookupTask extends AsyncTask<String, String, String> {
+        /**
+         * Before jumping into background thread, start sliding in the
+         * {@link ProgressBar}. We'll only show it once the animation finishes.
+         */
+        @Override
+        protected void onPreExecute() {
+            mTitleBar.startAnimation(mSlideIn);
+        }
+
+        /**
+         * Perform the background query using {@link ExtendedWikiHelper}, which
+         * may return an error message as the result.
+         */
+        @Override
+        protected String doInBackground(String... args) {
+            String query = args[0];
+            String parsedText = null;
+
+            try {
+                // If query word is null, assume request for random word
+                if (query == null) {
+                    query = ExtendedWikiHelper.getRandomWord();
+                }
+
+                if (query != null) {
+                    // Push our requested word to the title bar
+                    publishProgress(query);
+                    String wikiText = ExtendedWikiHelper.getPageContent(query, true);
+                    parsedText = ExtendedWikiHelper.formatWikiText(wikiText);
+                }
+            } catch (ApiException e) {
+                Log.e(TAG, "Problem making wiktionary request", e);
+            } catch (ParseException e) {
+                Log.e(TAG, "Problem making wiktionary request", e);
+            }
+
+            if (parsedText == null) {
+                parsedText = getString(R.string.empty_result);
+            }
+
+            return parsedText;
+        }
+
+        /**
+         * Our progress update pushes a title bar update.
+         */
+        @Override
+        protected void onProgressUpdate(String... args) {
+            String searchWord = args[0];
+            setEntryTitle(searchWord);
+        }
+
+        /**
+         * When finished, push the newly-found entry content into our
+         * {@link WebView} and hide the {@link ProgressBar}.
+         */
+        @Override
+        protected void onPostExecute(String parsedText) {
+            mTitleBar.startAnimation(mSlideOut);
+            mProgress.setVisibility(View.INVISIBLE);
+
+            setEntryContent(parsedText);
+        }
+    }
+
+    /**
+     * Make the {@link ProgressBar} visible when our in-animation finishes.
+     */
+    public void onAnimationEnd(Animation animation) {
+        mProgress.setVisibility(View.VISIBLE);
+    }
+
+    public void onAnimationRepeat(Animation animation) {
+        // Not interested if the animation repeats
+    }
+
+    public void onAnimationStart(Animation animation) {
+        // Not interested when the animation starts
+    }
+}
diff --git a/samples/Wiktionary/src/com/example/android/wiktionary/SimpleWikiHelper.java b/samples/Wiktionary/src/com/example/android/wiktionary/SimpleWikiHelper.java
new file mode 100644
index 000000000..1c71d7e8b
--- /dev/null
+++ b/samples/Wiktionary/src/com/example/android/wiktionary/SimpleWikiHelper.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.wiktionary;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.util.Log;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Helper methods to simplify talking with and parsing responses from a
+ * lightweight Wiktionary API. Before making any requests, you should call
+ * {@link #prepareUserAgent(Context)} to generate a User-Agent string based on
+ * your application package name and version.
+ */
+public class SimpleWikiHelper {
+    private static final String TAG = "SimpleWikiHelper";
+
+    /**
+     * Partial URL to use when requesting the detailed entry for a specific
+     * Wiktionary page. Use {@link String#format(String, Object...)} to insert
+     * the desired page title after escaping it as needed.
+     */
+    private static final String WIKTIONARY_PAGE =
+            "http://en.wiktionary.org/w/api.php?action=query&prop=revisions&titles=%s&" +
+            "rvprop=content&format=json%s";
+
+    /**
+     * Partial URL to append to {@link #WIKTIONARY_PAGE} when you want to expand
+     * any templates found on the requested page. This is useful when browsing
+     * full entries, but may use more network bandwidth.
+     */
+    private static final String WIKTIONARY_EXPAND_TEMPLATES =
+            "&rvexpandtemplates=true";
+
+    /**
+     * {@link StatusLine} HTTP status code when no server error has occurred.
+     */
+    private static final int HTTP_STATUS_OK = 200;
+
+    /**
+     * Shared buffer used by {@link #getUrlContent(String)} when reading results
+     * from an API request.
+     */
+    private static byte[] sBuffer = new byte[512];
+
+    /**
+     * User-agent string to use when making requests. Should be filled using
+     * {@link #prepareUserAgent(Context)} before making any other calls.
+     */
+    private static String sUserAgent = null;
+
+    /**
+     * Thrown when there were problems contacting the remote API server, either
+     * because of a network error, or the server returned a bad status code.
+     */
+    public static class ApiException extends Exception {
+        public ApiException(String detailMessage, Throwable throwable) {
+            super(detailMessage, throwable);
+        }
+
+        public ApiException(String detailMessage) {
+            super(detailMessage);
+        }
+    }
+
+    /**
+     * Thrown when there were problems parsing the response to an API call,
+     * either because the response was empty, or it was malformed.
+     */
+    public static class ParseException extends Exception {
+        public ParseException(String detailMessage, Throwable throwable) {
+            super(detailMessage, throwable);
+        }
+    }
+
+    /**
+     * Prepare the internal User-Agent string for use. This requires a
+     * {@link Context} to pull the package name and version number for this
+     * application.
+     */
+    public static void prepareUserAgent(Context context) {
+        try {
+            // Read package name and version number from manifest
+            PackageManager manager = context.getPackageManager();
+            PackageInfo info = manager.getPackageInfo(context.getPackageName(), 0);
+            sUserAgent = String.format(context.getString(R.string.template_user_agent),
+                    info.packageName, info.versionName);
+
+        } catch(NameNotFoundException e) {
+            Log.e(TAG, "Couldn't find package information in PackageManager", e);
+        }
+    }
+
+    /**
+     * Read and return the content for a specific Wiktionary page. This makes a
+     * lightweight API call, and trims out just the page content returned.
+     * Because this call blocks until results are available, it should not be
+     * run from a UI thread.
+     *
+     * @param title The exact title of the Wiktionary page requested.
+     * @param expandTemplates If true, expand any wiki templates found.
+     * @return Exact content of page.
+     * @throws ApiException If any connection or server error occurs.
+     * @throws ParseException If there are problems parsing the response.
+     */
+    public static String getPageContent(String title, boolean expandTemplates)
+            throws ApiException, ParseException {
+        // Encode page title and expand templates if requested
+        String encodedTitle = Uri.encode(title);
+        String expandClause = expandTemplates ? WIKTIONARY_EXPAND_TEMPLATES : "";
+
+        // Query the API for content
+        String content = getUrlContent(String.format(WIKTIONARY_PAGE,
+                encodedTitle, expandClause));
+        try {
+            // Drill into the JSON response to find the content body
+            JSONObject response = new JSONObject(content);
+            JSONObject query = response.getJSONObject("query");
+            JSONObject pages = query.getJSONObject("pages");
+            JSONObject page = pages.getJSONObject((String) pages.keys().next());
+            JSONArray revisions = page.getJSONArray("revisions");
+            JSONObject revision = revisions.getJSONObject(0);
+            return revision.getString("*");
+        } catch (JSONException e) {
+            throw new ParseException("Problem parsing API response", e);
+        }
+    }
+
+    /**
+     * Pull the raw text content of the given URL. This call blocks until the
+     * operation has completed, and is synchronized because it uses a shared
+     * buffer {@link #sBuffer}.
+     *
+     * @param url The exact URL to request.
+     * @return The raw content returned by the server.
+     * @throws ApiException If any connection or server error occurs.
+     */
+    protected static synchronized String getUrlContent(String url) throws ApiException {
+        if (sUserAgent == null) {
+            throw new ApiException("User-Agent string must be prepared");
+        }
+
+        // Create client and set our specific user-agent string
+        HttpClient client = new DefaultHttpClient();
+        HttpGet request = new HttpGet(url);
+        request.setHeader("User-Agent", sUserAgent);
+
+        try {
+            HttpResponse response = client.execute(request);
+
+            // Check if server response is valid
+            StatusLine status = response.getStatusLine();
+            if (status.getStatusCode() != HTTP_STATUS_OK) {
+                throw new ApiException("Invalid response from server: " +
+                        status.toString());
+            }
+
+            // Pull content stream from response
+            HttpEntity entity = response.getEntity();
+            InputStream inputStream = entity.getContent();
+
+            ByteArrayOutputStream content = new ByteArrayOutputStream();
+
+            // Read response into a buffered stream
+            int readBytes = 0;
+            while ((readBytes = inputStream.read(sBuffer)) != -1) {
+                content.write(sBuffer, 0, readBytes);
+            }
+
+            // Return result from buffered stream
+            return new String(content.toByteArray());
+        } catch (IOException e) {
+            throw new ApiException("Problem communicating with API", e);
+        }
+    }
+
+}
diff --git a/samples/Wiktionary/src/com/example/android/wiktionary/WordWidget.java b/samples/Wiktionary/src/com/example/android/wiktionary/WordWidget.java
new file mode 100644
index 000000000..e80eaf92a
--- /dev/null
+++ b/samples/Wiktionary/src/com/example/android/wiktionary/WordWidget.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.wiktionary;
+
+import com.example.android.wiktionary.SimpleWikiHelper.ApiException;
+import com.example.android.wiktionary.SimpleWikiHelper.ParseException;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.IBinder;
+import android.text.format.Time;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Define a simple widget that shows the Wiktionary "Word of the day." To build
+ * an update we spawn a background {@link Service} to perform the API queries.
+ */
+public class WordWidget extends AppWidgetProvider {
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        // To prevent any ANR timeouts, we perform the update in a service
+        context.startService(new Intent(context, UpdateService.class));
+    }
+
+    public static class UpdateService extends Service {
+        @Override
+        public void onStart(Intent intent, int startId) {
+            // Build the widget update for today
+            RemoteViews updateViews = buildUpdate(this);
+
+            // Push update for this widget to the home screen
+            ComponentName thisWidget = new ComponentName(this, WordWidget.class);
+            AppWidgetManager manager = AppWidgetManager.getInstance(this);
+            manager.updateAppWidget(thisWidget, updateViews);
+        }
+
+        @Override
+        public IBinder onBind(Intent intent) {
+            return null;
+        }
+
+        /**
+         * Regular expression that splits "Word of the day" entry into word
+         * name, word type, and the first description bullet point.
+         */
+        private static final String WOTD_PATTERN =
+            "(?s)\\{\\{wotd\\|(.+?)\\|(.+?)\\|([^#\\|]+).*?\\}\\}";
+
+        /**
+         * Build a widget update to show the current Wiktionary
+         * "Word of the day." Will block until the online API returns.
+         */
+        public RemoteViews buildUpdate(Context context) {
+            // Pick out month names from resources
+            Resources res = context.getResources();
+            String[] monthNames = res.getStringArray(R.array.month_names);
+
+            // Find current month and day
+            Time today = new Time();
+            today.setToNow();
+
+            // Build the page title for today, such as "March 21"
+            String pageName = res.getString(R.string.template_wotd_title,
+                    monthNames[today.month], today.monthDay);
+            String pageContent = null;
+
+            try {
+                // Try querying the Wiktionary API for today's word
+                SimpleWikiHelper.prepareUserAgent(context);
+                pageContent = SimpleWikiHelper.getPageContent(pageName, false);
+            } catch (ApiException e) {
+                Log.e("WordWidget", "Couldn't contact API", e);
+            } catch (ParseException e) {
+                Log.e("WordWidget", "Couldn't parse API response", e);
+            }
+
+            RemoteViews views = null;
+            Matcher matcher = Pattern.compile(WOTD_PATTERN).matcher(pageContent);
+            if (matcher.find()) {
+                // Build an update that holds the updated widget contents
+                views = new RemoteViews(context.getPackageName(), R.layout.widget_word);
+
+                String wordTitle = matcher.group(1);
+                views.setTextViewText(R.id.word_title, wordTitle);
+                views.setTextViewText(R.id.word_type, matcher.group(2));
+                views.setTextViewText(R.id.definition, matcher.group(3).trim());
+
+                // When user clicks on widget, launch to Wiktionary definition page
+                String definePage = String.format("%s://%s/%s", ExtendedWikiHelper.WIKI_AUTHORITY,
+                        ExtendedWikiHelper.WIKI_LOOKUP_HOST, wordTitle);
+                Intent defineIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(definePage));
+                PendingIntent pendingIntent = PendingIntent.getActivity(context,
+                        0 /* no requestCode */, defineIntent, 0 /* no flags */);
+                views.setOnClickPendingIntent(R.id.widget, pendingIntent);
+
+            } else {
+                // Didn't find word of day, so show error message
+                views = new RemoteViews(context.getPackageName(), R.layout.widget_message);
+                views.setTextViewText(R.id.message, context.getString(R.string.widget_error));
+            }
+            return views;
+        }
+    }
+}
diff --git a/samples/WiktionarySimple/Android.mk b/samples/WiktionarySimple/Android.mk
new file mode 100644
index 000000000..a5a1423e0
--- /dev/null
+++ b/samples/WiktionarySimple/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := samples
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := WiktionarySimple
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
+
+# Use the following include to make our test apk.
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/samples/WiktionarySimple/AndroidManifest.xml b/samples/WiktionarySimple/AndroidManifest.xml
new file mode 100644
index 000000000..c6b872486
--- /dev/null
+++ b/samples/WiktionarySimple/AndroidManifest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.android.simplewiktionary"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <application android:icon="@drawable/app_icon" android:label="@string/app_name">
+
+        <!-- Broadcast Receiver that will process AppWidget updates -->
+        <receiver android:name=".WordWidget" android:label="@string/widget_name">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                android:resource="@xml/widget_word" />
+        </receiver>
+
+        <!-- Service to perform web API queries -->
+        <service android:name=".WordWidget$UpdateService" />
+
+    </application>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4" />
+
+</manifest>
diff --git a/samples/WiktionarySimple/_index.html b/samples/WiktionarySimple/_index.html
new file mode 100644
index 000000000..cf8142e89
--- /dev/null
+++ b/samples/WiktionarySimple/_index.html
@@ -0,0 +1,10 @@
+<p>A sample application that demonstrates how to create an interactive widget for display on the Android home screen.</p>
+
+<p>When installed, this adds a "Wiktionary simple" option to the widget
+installation menu. The word of the day is downloaded from Wiktionary and
+displayed in a frame. Touching the widget will open a new browser session and
+load the word's Wiktionary entry.</p>
+
+<p>A more advanced version of this sample is available in the Wiktionary directory.</p>
+
+<img alt="" src="../images/wiktionary.png"/>
diff --git a/samples/WiktionarySimple/res/drawable/app_icon.png b/samples/WiktionarySimple/res/drawable/app_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b1417aad99e1ecf3376d795c9f76eb61d83202b
GIT binary patch
literal 1985
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
TZnFlg00000NkvXXu0mjfX5y*S

literal 0
HcmV?d00001

diff --git a/samples/WiktionarySimple/res/drawable/star_logo.png b/samples/WiktionarySimple/res/drawable/star_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b32d1756ccde3f84a26d989b45a8af70a7b60d04
GIT binary patch
literal 2747
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
BACUk6

literal 0
HcmV?d00001

diff --git a/samples/WiktionarySimple/res/drawable/widget_bg.xml b/samples/WiktionarySimple/res/drawable/widget_bg.xml
new file mode 100644
index 000000000..692a13d84
--- /dev/null
+++ b/samples/WiktionarySimple/res/drawable/widget_bg.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The stateful background drawable for a widget -->
+    <item android:state_window_focused="false" android:drawable="@drawable/widget_bg_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/widget_bg_pressed" />
+    <item android:state_focused="true" android:drawable="@drawable/widget_bg_selected" />
+    <item android:drawable="@drawable/widget_bg_normal" />
+</selector>
diff --git a/samples/WiktionarySimple/res/drawable/widget_bg_normal.9.png b/samples/WiktionarySimple/res/drawable/widget_bg_normal.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..314eb8ef96947d191ce4920c3d312da92fc65767
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9a!3HF~Pw#sVq!^2X+?^QKos)S9<gg`qySp&_
z2f+n<mrn+Ya29w(76Y|k2Vq7hjoB4ILG}_)Usv{<EWBcZ0xM3Hz5xpLc)B=-Se#By
zP~iQOzQFLuc^BQuZoE=mY#SAd!`|-OJzwN(;<{6PA?1R~S5yuD)d_vIc8dKrpLJHf
z#Kq8v*;)n$hE6U2|NcLJ;K+#+AKw43Z(F=vUVu+|N<>0RN<vc8tpELthyJ-Qk4QeE
zR`}ye?W99h6VyE-O88cEZ(uVCVsbq%^gsOVzSAA9a~K)^oKkptcd3~a&|M6ku6{1-
HoD!M<qgZ7I

literal 0
HcmV?d00001

diff --git a/samples/WiktionarySimple/res/drawable/widget_bg_pressed.9.png b/samples/WiktionarySimple/res/drawable/widget_bg_pressed.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc23e787b739f651bf5bd0333c6e022e89c25645
GIT binary patch
literal 275
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9a!3HF~Pw#sVq!^2X+?^QKos)S9<gg`qySp&_
z2f+n<mrn+Ya29w(76Y|k2Vq7hjoB4ILG}_)Usv{<EWBbu;<C+~dw@cdJzX3_EKVmU
zDDeJCUtsv-yo>H+H(seOwv7tK_w>@#H4kzg|Ch3)w>#|ZKJJHmFDQ8$`^3*!ZN$uN
z^50;Q_OFM(-!cd*yZpHS|38mUPY=)kfB(}T+&J^p!JsD~sd3`O#!k+xfA(w~zvbs9
z^$N~rxvl2ME_5bQ<_Txf`Xi>t7|R8f_qDX~9g3OyfBmi6>4M!B%nU!cm2Iu7dYysJ
OWAJqKb6Mw<&;$T6n`1}-

literal 0
HcmV?d00001

diff --git a/samples/WiktionarySimple/res/drawable/widget_bg_selected.9.png b/samples/WiktionarySimple/res/drawable/widget_bg_selected.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef0cdc066a526eeeb7ba760d907115a2d1c0c26a
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9a!3HF~Pw#sVq!^2X+?^QKos)S9<gg`qySp&_
z2f+n<mrn+Ya29w(76Y|k2Vq7hjoB4ILG}_)Usv{<EWBbuj4#94?gE9Tc)B=-Se#By
zP~iQOzQFLuc^BQuZoE=mY#SAd<HAl%obup^wVdIlW3H>q?zevUW;JPv<TCv;p)(s<
zXVptw6#ct$M}0%5pwgfB|LfV*+}zsg|Nl4MP@-Waz@t1RA|WLuA*pHB|9-|p|J;{H
zBp=Cg-rdB!E4LyiRptrjrv;zujxm-CD(`D)<2w{H_5b=?wbKQ=EtnZLOi<R9;}!V>
PbRUDKtDnm{r-UW|1UqF4

literal 0
HcmV?d00001

diff --git a/samples/WiktionarySimple/res/layout/widget_message.xml b/samples/WiktionarySimple/res/layout/widget_message.xml
new file mode 100644
index 000000000..ba9471447
--- /dev/null
+++ b/samples/WiktionarySimple/res/layout/widget_message.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    style="@style/WidgetBackground">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dip"
+        android:padding="10dip"
+        android:gravity="center"
+        android:text="@string/widget_loading"
+        style="@style/Text.Loading" />
+
+</LinearLayout>
diff --git a/samples/WiktionarySimple/res/layout/widget_word.xml b/samples/WiktionarySimple/res/layout/widget_word.xml
new file mode 100644
index 000000000..0e76f0b80
--- /dev/null
+++ b/samples/WiktionarySimple/res/layout/widget_word.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/widget"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:focusable="true"
+    style="@style/WidgetBackground">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:src="@drawable/star_logo" />
+
+    <TextView
+        android:id="@+id/word_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="14dip"
+        android:layout_marginBottom="1dip"
+        android:includeFontPadding="false"
+        android:singleLine="true"
+        android:ellipsize="end"
+        style="@style/Text.WordTitle" />
+
+    <TextView
+        android:id="@+id/word_type"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/word_title"
+        android:layout_toLeftOf="@id/icon"
+        android:layout_alignBaseline="@id/word_title"
+        android:paddingLeft="4dip"
+        android:includeFontPadding="false"
+        android:singleLine="true"
+        android:ellipsize="end"
+        style="@style/Text.WordType" />
+
+    <TextView
+        android:id="@+id/bullet"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/word_title"
+        android:paddingRight="4dip"
+        android:includeFontPadding="false"
+        android:singleLine="true"
+        style="@style/BulletPoint" />
+
+    <TextView
+        android:id="@+id/definition"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/word_title"
+        android:layout_toRightOf="@id/bullet"
+        android:paddingRight="5dip"
+        android:paddingBottom="4dip"
+        android:includeFontPadding="false"
+        android:lineSpacingMultiplier="0.9"
+        android:maxLines="4"
+        android:fadingEdge="vertical"
+        style="@style/Text.Definition" />
+
+</RelativeLayout>
diff --git a/samples/WiktionarySimple/res/values/strings.xml b/samples/WiktionarySimple/res/values/strings.xml
new file mode 100644
index 000000000..65e44cb86
--- /dev/null
+++ b/samples/WiktionarySimple/res/values/strings.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <string name="app_name">Wiktionary simple example</string>
+
+    <string name="template_user_agent">"%s/%s (Linux; Android)"</string>
+    <string name="template_wotd_title">"Wiktionary:Word of the day/%s %s"</string>
+    <string name="template_define_url">"http://en.wiktionary.org/wiki/%s"</string>
+
+    <string name="widget_name">Wiktionary simple</string>
+
+    <string name="widget_loading">Loading word\nof day\u2026</string>
+    <string name="widget_error">No word of\nday found</string>
+
+    <string-array name="month_names">
+        <item>January</item>
+        <item>February</item>
+        <item>March</item>
+        <item>April</item>
+        <item>May</item>
+        <item>June</item>
+        <item>July</item>
+        <item>August</item>
+        <item>September</item>
+        <item>October</item>
+        <item>November</item>
+        <item>December</item>
+    </string-array>
+
+</resources>
diff --git a/samples/WiktionarySimple/res/values/styles.xml b/samples/WiktionarySimple/res/values/styles.xml
new file mode 100644
index 000000000..42d679c56
--- /dev/null
+++ b/samples/WiktionarySimple/res/values/styles.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+
+    <style name="WidgetBackground">
+        <item name="android:background">@drawable/widget_bg</item>
+    </style>
+
+    <style name="BulletPoint">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="Text" />
+
+    <style name="Text.Loading">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="Text.WordTitle">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="Text.WordType">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textStyle">italic</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="Text.Definition">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+</resources>
diff --git a/samples/WiktionarySimple/res/xml/widget_word.xml b/samples/WiktionarySimple/res/xml/widget_word.xml
new file mode 100644
index 000000000..46d31c321
--- /dev/null
+++ b/samples/WiktionarySimple/res/xml/widget_word.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="146dip"
+    android:minHeight="72dip"
+    android:updatePeriodMillis="86400000"
+    android:initialLayout="@layout/widget_message" />
diff --git a/samples/WiktionarySimple/src/com/example/android/simplewiktionary/SimpleWikiHelper.java b/samples/WiktionarySimple/src/com/example/android/simplewiktionary/SimpleWikiHelper.java
new file mode 100644
index 000000000..bb39d7bd7
--- /dev/null
+++ b/samples/WiktionarySimple/src/com/example/android/simplewiktionary/SimpleWikiHelper.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.simplewiktionary;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.StatusLine;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.util.Log;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Helper methods to simplify talking with and parsing responses from a
+ * lightweight Wiktionary API. Before making any requests, you should call
+ * {@link #prepareUserAgent(Context)} to generate a User-Agent string based on
+ * your application package name and version.
+ */
+public class SimpleWikiHelper {
+    private static final String TAG = "SimpleWikiHelper";
+
+    /**
+     * Regular expression that splits "Word of the day" entry into word
+     * name, word type, and the first description bullet point.
+     */
+    public static final String WORD_OF_DAY_REGEX =
+            "(?s)\\{\\{wotd\\|(.+?)\\|(.+?)\\|([^#\\|]+).*?\\}\\}";
+
+    /**
+     * Partial URL to use when requesting the detailed entry for a specific
+     * Wiktionary page. Use {@link String#format(String, Object...)} to insert
+     * the desired page title after escaping it as needed.
+     */
+    private static final String WIKTIONARY_PAGE =
+            "http://en.wiktionary.org/w/api.php?action=query&prop=revisions&titles=%s&" +
+            "rvprop=content&format=json%s";
+
+    /**
+     * Partial URL to append to {@link #WIKTIONARY_PAGE} when you want to expand
+     * any templates found on the requested page. This is useful when browsing
+     * full entries, but may use more network bandwidth.
+     */
+    private static final String WIKTIONARY_EXPAND_TEMPLATES =
+            "&rvexpandtemplates=true";
+
+    /**
+     * {@link StatusLine} HTTP status code when no server error has occurred.
+     */
+    private static final int HTTP_STATUS_OK = 200;
+
+    /**
+     * Shared buffer used by {@link #getUrlContent(String)} when reading results
+     * from an API request.
+     */
+    private static byte[] sBuffer = new byte[512];
+
+    /**
+     * User-agent string to use when making requests. Should be filled using
+     * {@link #prepareUserAgent(Context)} before making any other calls.
+     */
+    private static String sUserAgent = null;
+
+    /**
+     * Thrown when there were problems contacting the remote API server, either
+     * because of a network error, or the server returned a bad status code.
+     */
+    public static class ApiException extends Exception {
+        public ApiException(String detailMessage, Throwable throwable) {
+            super(detailMessage, throwable);
+        }
+
+        public ApiException(String detailMessage) {
+            super(detailMessage);
+        }
+    }
+
+    /**
+     * Thrown when there were problems parsing the response to an API call,
+     * either because the response was empty, or it was malformed.
+     */
+    public static class ParseException extends Exception {
+        public ParseException(String detailMessage, Throwable throwable) {
+            super(detailMessage, throwable);
+        }
+    }
+
+    /**
+     * Prepare the internal User-Agent string for use. This requires a
+     * {@link Context} to pull the package name and version number for this
+     * application.
+     */
+    public static void prepareUserAgent(Context context) {
+        try {
+            // Read package name and version number from manifest
+            PackageManager manager = context.getPackageManager();
+            PackageInfo info = manager.getPackageInfo(context.getPackageName(), 0);
+            sUserAgent = String.format(context.getString(R.string.template_user_agent),
+                    info.packageName, info.versionName);
+
+        } catch(NameNotFoundException e) {
+            Log.e(TAG, "Couldn't find package information in PackageManager", e);
+        }
+    }
+
+    /**
+     * Read and return the content for a specific Wiktionary page. This makes a
+     * lightweight API call, and trims out just the page content returned.
+     * Because this call blocks until results are available, it should not be
+     * run from a UI thread.
+     *
+     * @param title The exact title of the Wiktionary page requested.
+     * @param expandTemplates If true, expand any wiki templates found.
+     * @return Exact content of page.
+     * @throws ApiException If any connection or server error occurs.
+     * @throws ParseException If there are problems parsing the response.
+     */
+    public static String getPageContent(String title, boolean expandTemplates)
+            throws ApiException, ParseException {
+        // Encode page title and expand templates if requested
+        String encodedTitle = Uri.encode(title);
+        String expandClause = expandTemplates ? WIKTIONARY_EXPAND_TEMPLATES : "";
+
+        // Query the API for content
+        String content = getUrlContent(String.format(WIKTIONARY_PAGE,
+                encodedTitle, expandClause));
+        try {
+            // Drill into the JSON response to find the content body
+            JSONObject response = new JSONObject(content);
+            JSONObject query = response.getJSONObject("query");
+            JSONObject pages = query.getJSONObject("pages");
+            JSONObject page = pages.getJSONObject((String) pages.keys().next());
+            JSONArray revisions = page.getJSONArray("revisions");
+            JSONObject revision = revisions.getJSONObject(0);
+            return revision.getString("*");
+        } catch (JSONException e) {
+            throw new ParseException("Problem parsing API response", e);
+        }
+    }
+
+    /**
+     * Pull the raw text content of the given URL. This call blocks until the
+     * operation has completed, and is synchronized because it uses a shared
+     * buffer {@link #sBuffer}.
+     *
+     * @param url The exact URL to request.
+     * @return The raw content returned by the server.
+     * @throws ApiException If any connection or server error occurs.
+     */
+    protected static synchronized String getUrlContent(String url) throws ApiException {
+        if (sUserAgent == null) {
+            throw new ApiException("User-Agent string must be prepared");
+        }
+
+        // Create client and set our specific user-agent string
+        HttpClient client = new DefaultHttpClient();
+        HttpGet request = new HttpGet(url);
+        request.setHeader("User-Agent", sUserAgent);
+
+        try {
+            HttpResponse response = client.execute(request);
+
+            // Check if server response is valid
+            StatusLine status = response.getStatusLine();
+            if (status.getStatusCode() != HTTP_STATUS_OK) {
+                throw new ApiException("Invalid response from server: " +
+                        status.toString());
+            }
+
+            // Pull content stream from response
+            HttpEntity entity = response.getEntity();
+            InputStream inputStream = entity.getContent();
+
+            ByteArrayOutputStream content = new ByteArrayOutputStream();
+
+            // Read response into a buffered stream
+            int readBytes = 0;
+            while ((readBytes = inputStream.read(sBuffer)) != -1) {
+                content.write(sBuffer, 0, readBytes);
+            }
+
+            // Return result from buffered stream
+            return new String(content.toByteArray());
+        } catch (IOException e) {
+            throw new ApiException("Problem communicating with API", e);
+        }
+    }
+}
diff --git a/samples/WiktionarySimple/src/com/example/android/simplewiktionary/WordWidget.java b/samples/WiktionarySimple/src/com/example/android/simplewiktionary/WordWidget.java
new file mode 100644
index 000000000..d005faa4d
--- /dev/null
+++ b/samples/WiktionarySimple/src/com/example/android/simplewiktionary/WordWidget.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.simplewiktionary;
+
+import com.example.android.simplewiktionary.SimpleWikiHelper.ApiException;
+import com.example.android.simplewiktionary.SimpleWikiHelper.ParseException;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.Uri;
+import android.os.IBinder;
+import android.text.format.Time;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Define a simple widget that shows the Wiktionary "Word of the day." To build
+ * an update we spawn a background {@link Service} to perform the API queries.
+ */
+public class WordWidget extends AppWidgetProvider {
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager,
+            int[] appWidgetIds) {
+        // To prevent any ANR timeouts, we perform the update in a service
+        context.startService(new Intent(context, UpdateService.class));
+    }
+
+    public static class UpdateService extends Service {
+        @Override
+        public void onStart(Intent intent, int startId) {
+            // Build the widget update for today
+            RemoteViews updateViews = buildUpdate(this);
+
+            // Push update for this widget to the home screen
+            ComponentName thisWidget = new ComponentName(this, WordWidget.class);
+            AppWidgetManager manager = AppWidgetManager.getInstance(this);
+            manager.updateAppWidget(thisWidget, updateViews);
+        }
+
+        /**
+         * Build a widget update to show the current Wiktionary
+         * "Word of the day." Will block until the online API returns.
+         */
+        public RemoteViews buildUpdate(Context context) {
+            // Pick out month names from resources
+            Resources res = context.getResources();
+            String[] monthNames = res.getStringArray(R.array.month_names);
+
+            // Find current month and day
+            Time today = new Time();
+            today.setToNow();
+
+            // Build today's page title, like "Wiktionary:Word of the day/March 21"
+            String pageName = res.getString(R.string.template_wotd_title,
+                    monthNames[today.month], today.monthDay);
+            RemoteViews updateViews = null;
+            String pageContent = "";
+
+            try {
+                // Try querying the Wiktionary API for today's word
+                SimpleWikiHelper.prepareUserAgent(context);
+                pageContent = SimpleWikiHelper.getPageContent(pageName, false);
+            } catch (ApiException e) {
+                Log.e("WordWidget", "Couldn't contact API", e);
+            } catch (ParseException e) {
+                Log.e("WordWidget", "Couldn't parse API response", e);
+            }
+
+            // Use a regular expression to parse out the word and its definition
+            Pattern pattern = Pattern.compile(SimpleWikiHelper.WORD_OF_DAY_REGEX);
+            Matcher matcher = pattern.matcher(pageContent);
+            if (matcher.find()) {
+                // Build an update that holds the updated widget contents
+                updateViews = new RemoteViews(context.getPackageName(), R.layout.widget_word);
+
+                String wordTitle = matcher.group(1);
+                updateViews.setTextViewText(R.id.word_title, wordTitle);
+                updateViews.setTextViewText(R.id.word_type, matcher.group(2));
+                updateViews.setTextViewText(R.id.definition, matcher.group(3).trim());
+
+                // When user clicks on widget, launch to Wiktionary definition page
+                String definePage = res.getString(R.string.template_define_url,
+                        Uri.encode(wordTitle));
+                Intent defineIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(definePage));
+                PendingIntent pendingIntent = PendingIntent.getActivity(context,
+                        0 /* no requestCode */, defineIntent, 0 /* no flags */);
+                updateViews.setOnClickPendingIntent(R.id.widget, pendingIntent);
+
+            } else {
+                // Didn't find word of day, so show error message
+                updateViews = new RemoteViews(context.getPackageName(), R.layout.widget_message);
+                CharSequence errorMessage = context.getText(R.string.widget_error);
+                updateViews.setTextViewText(R.id.message, errorMessage);
+            }
+            return updateViews;
+        }
+
+        @Override
+        public IBinder onBind(Intent intent) {
+            // We don't need to bind to this service
+            return null;
+        }
+    }
+}

From a13e890e57951b0cd78146fc2a04de15ff35cb33 Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Wed, 9 Dec 2009 15:46:07 -0800
Subject: [PATCH 09/17] Update documentation to indicate EGL ES 2.0 isn't
 supported in the emulator.

---
 ndk/docs/CHANGES.TXT     | 4 ++++
 ndk/docs/STABLE-APIS.TXT | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ndk/docs/CHANGES.TXT b/ndk/docs/CHANGES.TXT
index 145933c0b..c6db521e8 100644
--- a/ndk/docs/CHANGES.TXT
+++ b/ndk/docs/CHANGES.TXT
@@ -56,6 +56,10 @@ IMPORTANT CHANGES:
   OpenGL ES 2.0 is currently *not* available from Java, and must be used
   through native code exclusively.
 
+  IMPORTANT: OpenGL ES 2.0 is not supported in the Android emulator at this
+             time. Running/testing any native code that depends on it thus
+             requires a real device.
+
 - The NDK build script will now remove installed binaries from the application
   project's path before starting the build. This ensures that:
 
diff --git a/ndk/docs/STABLE-APIS.TXT b/ndk/docs/STABLE-APIS.TXT
index 700bb8843..48e6b5aeb 100644
--- a/ndk/docs/STABLE-APIS.TXT
+++ b/ndk/docs/STABLE-APIS.TXT
@@ -157,8 +157,7 @@ IV. Android-5 Stable Native APIs:
 ----------------------------------
 
 All the APIs listed below are available for developing native code that runs
-on the Eclair experimental branch, which will be used to make the next official
-platform system images.
+on Android 2.0 system images and above.
 
 
 The OpenGL ES 2.0 Library:
@@ -183,3 +182,8 @@ http://android-developers.blogspot.com/2009/04/introducing-glsurfaceview.html
 
 The "hello-gl2" sample application demonstrate this. It is used to draw a very
 simple triangle with the help of a vertex and fragment shaders.
+
+IMPORTANT NOTE:
+    The Android emulator does not support OpenGL ES 2.0 hardware emulation
+    at this time. Running and testing code that uses this API requires a
+    real device with such capabilities.

From e7e7a6b821367c5c2ce7a0eac66f92a2689c22e9 Mon Sep 17 00:00:00 2001
From: Roman Nurik <romannurik@google.com>
Date: Thu, 10 Dec 2009 09:43:24 -0800
Subject: [PATCH 10/17] Modify index pages of MultiResolution, Wiktionary, and
 WiktionarySimple samples, to point to new screenshots. Also some minor
 cleanup.

---
 samples/MultiResolution/_index.html  |  2 +-
 samples/Wiktionary/_index.html       | 12 ++++++------
 samples/WiktionarySimple/_index.html |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/samples/MultiResolution/_index.html b/samples/MultiResolution/_index.html
index 73089ae64..825ea4da4 100644
--- a/samples/MultiResolution/_index.html
+++ b/samples/MultiResolution/_index.html
@@ -17,4 +17,4 @@ It demonstrates using:
 </ul>
 </p>
 
-<img alt="" src="../images/sample_multires.png"/>
+<img alt="" src="../images/MultiResolution.png"/>
diff --git a/samples/Wiktionary/_index.html b/samples/Wiktionary/_index.html
index eb7cb96bb..507dda331 100644
--- a/samples/Wiktionary/_index.html
+++ b/samples/Wiktionary/_index.html
@@ -1,10 +1,10 @@
-<p>A sample application that demonstrates how to create an interactive widget
-for display on the Android home screen.</p>
+<p>A sample application that demonstrates how to create an interactive Android
+home screen widget that launches an application activity.</p>
 
 <p>When installed, this adds a "Wiktionary" option to the widget installation
 menu. The word of the day is downloaded from Wiktionary and displayed in a
-frame. Touching the widget will open a custom WebView to render the
-definition.</p>
+frame. Touching the widget will launch a custom application activity showing
+more details.</p>
 
-<img alt="" src="../images/wiktionary.png"/>
-<img alt="" src="../images/wiktionary_detail.png"/>
+<img alt="" src="../images/WiktionarySimple.png"/>
+<img alt="" src="../images/Wiktionary.png"/>
diff --git a/samples/WiktionarySimple/_index.html b/samples/WiktionarySimple/_index.html
index cf8142e89..3980e3326 100644
--- a/samples/WiktionarySimple/_index.html
+++ b/samples/WiktionarySimple/_index.html
@@ -7,4 +7,4 @@ load the word's Wiktionary entry.</p>
 
 <p>A more advanced version of this sample is available in the Wiktionary directory.</p>
 
-<img alt="" src="../images/wiktionary.png"/>
+<img alt="" src="../images/WiktionarySimple.png"/>

From 94b6d06899ddb3f97cd0171bce5de1cb60602d01 Mon Sep 17 00:00:00 2001
From: Tom O'Neill <tomo@google.com>
Date: Wed, 9 Dec 2009 15:41:05 -0800
Subject: [PATCH 11/17] Extract and check in NotepadCodeLab.zip for change
 tracking

The 3-part Notepad tutorial is currently only available in the zip archive
frameworks/base/docs/html/guide/tutorials/notepad/codelab/NotepadCodeLab.zip.
This CL adds the uncompressed code to the repository so that there is a
paper trail of future changes to the code.
---
 .../Notepadv1/AndroidManifest.xml             |  11 +
 .../Notepadv1/res/drawable/icon.png           | Bin 0 -> 6094 bytes
 .../Notepadv1/res/layout/notepad_list.xml     |   6 +
 .../Notepadv1/res/values/strings.xml          |   5 +
 .../com/android/demo/notepad1/Notepadv1.java  |  44 ++++
 .../android/demo/notepad1/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv1Solution/AndroidManifest.xml     |  12 ++
 .../Notepadv1Solution/res/drawable/icon.png   | Bin 0 -> 6094 bytes
 .../res/layout/notepad_list.xml               |  14 ++
 .../res/layout/notes_row.xml                  |   5 +
 .../Notepadv1Solution/res/values/strings.xml  |   6 +
 .../com/android/demo/notepad1/Notepadv1.java  |  78 ++++++++
 .../android/demo/notepad1/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv2/AndroidManifest.xml             |  12 ++
 .../Notepadv2/res/drawable/icon.png           | Bin 0 -> 6094 bytes
 .../Notepadv2/res/layout/note_edit.xml        |  33 +++
 .../Notepadv2/res/layout/notes_list.xml       |  13 ++
 .../Notepadv2/res/layout/notes_row.xml        |   4 +
 .../Notepadv2/res/values/strings.xml          |  11 +
 .../com/android/demo/notepad2/Notepadv2.java  | 120 +++++++++++
 .../android/demo/notepad2/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv2Solution/AndroidManifest.xml     |  12 ++
 .../Notepadv2Solution/res/drawable/icon.png   | Bin 0 -> 6094 bytes
 .../res/layout/note_edit.xml                  |  33 +++
 .../res/layout/notes_list.xml                 |  13 ++
 .../res/layout/notes_row.xml                  |   4 +
 .../Notepadv2Solution/res/values/strings.xml  |  11 +
 .../com/android/demo/notepad2/NoteEdit.java   |  76 +++++++
 .../com/android/demo/notepad2/Notepadv2.java  | 147 ++++++++++++++
 .../android/demo/notepad2/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv3/AndroidManifest.xml             |  12 ++
 .../Notepadv3/res/drawable/icon.png           | Bin 0 -> 6094 bytes
 .../Notepadv3/res/layout/note_edit.xml        |  33 +++
 .../Notepadv3/res/layout/notes_list.xml       |  13 ++
 .../Notepadv3/res/layout/notes_row.xml        |   4 +
 .../Notepadv3/res/values/strings.xml          |  11 +
 .../com/android/demo/notepad3/NoteEdit.java   |  76 +++++++
 .../com/android/demo/notepad3/Notepadv3.java  | 148 ++++++++++++++
 .../android/demo/notepad3/NotesDbAdapter.java | 188 ++++++++++++++++++
 .../Notepadv3Solution/AndroidManifest.xml     |  12 ++
 .../Notepadv3Solution/res/drawable/icon.png   | Bin 0 -> 6094 bytes
 .../res/layout/note_edit.xml                  |  33 +++
 .../res/layout/notes_list.xml                 |  13 ++
 .../res/layout/notes_row.xml                  |   4 +
 .../Notepadv3Solution/res/values/strings.xml  |  11 +
 .../com/android/demo/notepad3/NoteEdit.java   | 109 ++++++++++
 .../com/android/demo/notepad3/Notepadv3.java  | 124 ++++++++++++
 .../android/demo/notepad3/NotesDbAdapter.java | 188 ++++++++++++++++++
 48 files changed, 2401 insertions(+)
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/res/layout/notepad_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/Notepadv1.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notepad_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/Notepadv1.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/Notepadv2.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NoteEdit.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/Notepadv2.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NoteEdit.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/Notepadv3.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NotesDbAdapter.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/AndroidManifest.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/drawable/icon.png
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_row.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/res/values/strings.xml
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/Notepadv3.java
 create mode 100755 tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NotesDbAdapter.java

diff --git a/tutorials/NotepadCodeLab/Notepadv1/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv1/AndroidManifest.xml
new file mode 100755
index 000000000..33f30da3c
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.demo.notepad1">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv1" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv1/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv1/res/layout/notepad_list.xml b/tutorials/NotepadCodeLab/Notepadv1/res/layout/notepad_list.xml
new file mode 100755
index 000000000..154888dd3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/res/layout/notepad_list.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv1/res/values/strings.xml
new file mode 100755
index 000000000..5698961a6
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v1</string>
+    <string name="no_notes">No Notes Yet</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/Notepadv1.java b/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/Notepadv1.java
new file mode 100755
index 000000000..43e7a7733
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/Notepadv1.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad1;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+public class Notepadv1 extends Activity {
+	private int mNoteNumber = 1;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // TODO Auto-generated method stub
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // TODO Auto-generated method stub
+        return super.onOptionsItemSelected(item);
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/NotesDbAdapter.java
new file mode 100755
index 000000000..6f85bbd20
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1/src/com/android/demo/notepad1/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad1;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv1Solution/AndroidManifest.xml
new file mode 100755
index 000000000..99023fe78
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.demo.notepad1">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv1" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv1Solution/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notepad_list.xml b/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notepad_list.xml
new file mode 100755
index 000000000..0c8dbabee
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notepad_list.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+	<ListView android:id="@id/android:list"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+  	<TextView android:id="@id/android:empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/no_notes"/>
+        
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notes_row.xml
new file mode 100755
index 000000000..6b1a65b05
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/res/layout/notes_row.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv1Solution/res/values/strings.xml
new file mode 100755
index 000000000..265bc62e3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v1</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Item</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/Notepadv1.java b/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/Notepadv1.java
new file mode 100755
index 000000000..a1819ed0f
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/Notepadv1.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad1;
+
+import android.app.ListActivity;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.SimpleCursorAdapter;
+
+public class Notepadv1 extends ListActivity {
+	public static final int INSERT_ID = Menu.FIRST;
+	
+	private int mNoteNumber = 1;
+	private NotesDbAdapter mDbHelper;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notepad_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+    	boolean result = super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID, 0, R.string.menu_insert);
+        return result;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+    	switch (item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+    
+    private void createNote() {
+        String noteName = "Note " + mNoteNumber++;
+        mDbHelper.createNote(noteName, "");
+        fillData();
+    }
+    
+    private void fillData() {
+        // Get all of the notes from the database and create the item list
+        Cursor c = mDbHelper.fetchAllNotes();
+        startManagingCursor(c);
+
+        String[] from = new String[] { NotesDbAdapter.KEY_TITLE };
+        int[] to = new int[] { R.id.text1 };
+        
+        // Now create an array adapter and set it to display using our row
+        SimpleCursorAdapter notes =
+            new SimpleCursorAdapter(this, R.layout.notes_row, c, from, to);
+        setListAdapter(notes);
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/NotesDbAdapter.java
new file mode 100755
index 000000000..6f85bbd20
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/src/com/android/demo/notepad1/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad1;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv2/AndroidManifest.xml
new file mode 100755
index 000000000..738fb2afc
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.demo.notepad2">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv2" android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv2/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml
new file mode 100755
index 000000000..b254552c3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/note_edit.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	
+	<LinearLayout android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:text="@string/title" />
+		<EditText android:id="@+id/title" 
+		  android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_weight="1"/>
+	</LinearLayout>
+
+	<TextView android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
+		android:text="@string/body" />
+	<EditText android:id="@+id/body" android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:scrollbars="vertical" />
+	
+	<Button android:id="@+id/confirm" 
+	  android:text="@string/confirm"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml
new file mode 100755
index 000000000..29ae88631
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    	android:layout_height="wrap_content">
+    
+    <ListView android:id="@+id/android:list"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"/>
+  	<TextView android:id="@+id/android:empty"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"
+        	android:text="No Notes!"/>
+</LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_row.xml
new file mode 100755
index 000000000..f28a41bea
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_row.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv2/res/values/strings.xml
new file mode 100755
index 000000000..b70c3f843
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v2</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Note</string>
+    <string name="menu_delete">Delete Note</string>
+    <string name="title">Title</string>
+    <string name="body">Body</string>
+    <string name="confirm">Confirm</string>
+    <string name="edit_note">Edit Note</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/Notepadv2.java b/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/Notepadv2.java
new file mode 100755
index 000000000..abfc53864
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/Notepadv2.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+
+public class Notepadv2 extends ListActivity {
+    private static final int ACTIVITY_CREATE=0;
+    private static final int ACTIVITY_EDIT=1;
+    
+    private static final int INSERT_ID = Menu.FIRST;
+    private static final int DELETE_ID = Menu.FIRST + 1;
+
+    private NotesDbAdapter mDbHelper;
+    private Cursor mNotesCursor;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notes_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+    }
+    
+    private void fillData() {
+        // Get all of the rows from the database and create the item list
+        mNotesCursor = mDbHelper.fetchAllNotes();
+        startManagingCursor(mNotesCursor);
+        
+        // Create an array to specify the fields we want to display in the list (only TITLE)
+        String[] from = new String[]{NotesDbAdapter.KEY_TITLE};
+        
+        // and an array of the fields we want to bind those fields to (in this case just text1)
+        int[] to = new int[]{R.id.text1};
+        
+        // Now create a simple cursor adapter and set it to display
+        SimpleCursorAdapter notes = 
+        	    new SimpleCursorAdapter(this, R.layout.notes_row, mNotesCursor, from, to);
+        setListAdapter(notes);
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID,0, R.string.menu_insert);
+        return true;
+    }
+
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        switch(item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+        }
+        
+        return super.onMenuItemSelected(featureId, item);
+    }
+
+    @Override
+	public void onCreateContextMenu(ContextMenu menu, View v,
+			ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+		
+        // TODO: fill in rest of method
+	}
+
+    @Override
+	public boolean onContextItemSelected(MenuItem item) {
+		return super.onContextItemSelected(item);
+		
+        // TODO: fill in rest of method
+	}
+
+    private void createNote() {
+        // TODO: fill in implementation
+
+    }
+    
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+
+        // TODO: fill in rest of method
+        
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        
+        // TODO: fill in rest of method
+        
+    }
+
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/NotesDbAdapter.java
new file mode 100755
index 000000000..5bf51b1e5
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2/src/com/android/demo/notepad2/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/AndroidManifest.xml
new file mode 100755
index 000000000..dbfc9d0f7
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.demo.notepad2">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv2" 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=".NoteEdit"></activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv2Solution/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml
new file mode 100755
index 000000000..b254552c3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/note_edit.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	
+	<LinearLayout android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:text="@string/title" />
+		<EditText android:id="@+id/title" 
+		  android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_weight="1"/>
+	</LinearLayout>
+
+	<TextView android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
+		android:text="@string/body" />
+	<EditText android:id="@+id/body" android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:scrollbars="vertical" />
+	
+	<Button android:id="@+id/confirm" 
+	  android:text="@string/confirm"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml
new file mode 100755
index 000000000..29ae88631
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    	android:layout_height="wrap_content">
+    
+    <ListView android:id="@+id/android:list"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"/>
+  	<TextView android:id="@+id/android:empty"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"
+        	android:text="No Notes!"/>
+</LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_row.xml
new file mode 100755
index 000000000..f28a41bea
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_row.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/values/strings.xml
new file mode 100755
index 000000000..b70c3f843
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v2</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Note</string>
+    <string name="menu_delete">Delete Note</string>
+    <string name="title">Title</string>
+    <string name="body">Body</string>
+    <string name="confirm">Confirm</string>
+    <string name="edit_note">Edit Note</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NoteEdit.java b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NoteEdit.java
new file mode 100755
index 000000000..6c5e664b5
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NoteEdit.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.savedInstanceState
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class NoteEdit extends Activity {
+
+	private EditText mTitleText;
+    private EditText mBodyText;
+    private Long mRowId;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.note_edit);
+       
+        mTitleText = (EditText) findViewById(R.id.title);
+        mBodyText = (EditText) findViewById(R.id.body);
+      
+        Button confirmButton = (Button) findViewById(R.id.confirm);
+       
+        mRowId = null;
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+            String body = extras.getString(NotesDbAdapter.KEY_BODY);
+            mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+          
+            if (title != null) {
+                mTitleText.setText(title);
+            }
+            if (body != null) {
+                mBodyText.setText(body);
+            }
+        }
+       
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+
+            public void onClick(View view) {
+                Bundle bundle = new Bundle();
+               
+                bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString());
+                bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString());
+                if (mRowId != null) {
+                    bundle.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+                }
+                
+                Intent mIntent = new Intent();
+                mIntent.putExtras(bundle);
+                setResult(RESULT_OK, mIntent);
+                finish();
+            }
+            
+        });
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/Notepadv2.java b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/Notepadv2.java
new file mode 100755
index 000000000..1b3398291
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/Notepadv2.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+
+public class Notepadv2 extends ListActivity {
+    private static final int ACTIVITY_CREATE=0;
+    private static final int ACTIVITY_EDIT=1;
+    
+    private static final int INSERT_ID = Menu.FIRST;
+    private static final int DELETE_ID = Menu.FIRST + 1;
+
+    private NotesDbAdapter mDbHelper;
+    private Cursor mNotesCursor;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notes_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+        registerForContextMenu(getListView());
+    }
+    
+    private void fillData() {
+        // Get all of the rows from the database and create the item list
+        mNotesCursor = mDbHelper.fetchAllNotes();
+        startManagingCursor(mNotesCursor);
+        
+        // Create an array to specify the fields we want to display in the list (only TITLE)
+        String[] from = new String[]{NotesDbAdapter.KEY_TITLE};
+        
+        // and an array of the fields we want to bind those fields to (in this case just text1)
+        int[] to = new int[]{R.id.text1};
+        
+        // Now create a simple cursor adapter and set it to display
+        SimpleCursorAdapter notes = 
+        	    new SimpleCursorAdapter(this, R.layout.notes_row, mNotesCursor, from, to);
+        setListAdapter(notes);
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID,0, R.string.menu_insert);
+        return true;
+    }
+    
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        switch(item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+	    }        
+        return super.onMenuItemSelected(featureId, item);
+    }
+
+    @Override
+	public void onCreateContextMenu(ContextMenu menu, View v,
+			ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+        menu.add(0, DELETE_ID, 0, R.string.menu_delete);
+	}
+
+    @Override
+	public boolean onContextItemSelected(MenuItem item) {
+		switch(item.getItemId()) {
+    	case DELETE_ID:
+    		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+	        mDbHelper.deleteNote(info.id);
+	        fillData();
+	        return true;
+		}
+		return super.onContextItemSelected(item);
+	}
+
+	private void createNote() {
+    	Intent i = new Intent(this, NoteEdit.class);
+    	 startActivityForResult(i, ACTIVITY_CREATE);
+    }
+    
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+    	super.onListItemClick(l, v, position, id);
+        Cursor c = mNotesCursor;
+        c.moveToPosition(position);
+        Intent i = new Intent(this, NoteEdit.class);
+        i.putExtra(NotesDbAdapter.KEY_ROWID, id);
+        i.putExtra(NotesDbAdapter.KEY_TITLE, c.getString(
+                c.getColumnIndexOrThrow(NotesDbAdapter.KEY_TITLE)));
+        i.putExtra(NotesDbAdapter.KEY_BODY, c.getString(
+                c.getColumnIndexOrThrow(NotesDbAdapter.KEY_BODY)));
+        startActivityForResult(i, ACTIVITY_EDIT);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        Bundle extras = intent.getExtras();
+        switch(requestCode) {
+        case ACTIVITY_CREATE:
+            String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+            String body = extras.getString(NotesDbAdapter.KEY_BODY);
+            mDbHelper.createNote(title, body);
+            fillData();
+            break;
+        case ACTIVITY_EDIT:
+            Long rowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+            if (rowId != null) {
+                String editTitle = extras.getString(NotesDbAdapter.KEY_TITLE);
+                String editBody = extras.getString(NotesDbAdapter.KEY_BODY);
+                mDbHelper.updateNote(rowId, editTitle, editBody);
+            }
+            fillData();
+            break;
+        }
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NotesDbAdapter.java
new file mode 100755
index 000000000..5bf51b1e5
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/src/com/android/demo/notepad2/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad2;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv3/AndroidManifest.xml
new file mode 100755
index 000000000..adb07ffdb
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.demo.notepad3">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv3" 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=".NoteEdit"/>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv3/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml
new file mode 100755
index 000000000..b254552c3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/note_edit.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	
+	<LinearLayout android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:text="@string/title" />
+		<EditText android:id="@+id/title" 
+		  android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_weight="1"/>
+	</LinearLayout>
+
+	<TextView android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
+		android:text="@string/body" />
+	<EditText android:id="@+id/body" android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:scrollbars="vertical" />
+	
+	<Button android:id="@+id/confirm" 
+	  android:text="@string/confirm"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml
new file mode 100755
index 000000000..29ae88631
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    	android:layout_height="wrap_content">
+    
+    <ListView android:id="@+id/android:list"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"/>
+  	<TextView android:id="@+id/android:empty"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"
+        	android:text="No Notes!"/>
+</LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_row.xml
new file mode 100755
index 000000000..f28a41bea
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_row.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv3/res/values/strings.xml
new file mode 100755
index 000000000..ae63b837d
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v3</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Note</string>
+    <string name="menu_delete">Delete Note</string>
+    <string name="title">Title</string>
+    <string name="body">Body</string>
+    <string name="confirm">Confirm</string>
+    <string name="edit_note">Edit Note</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NoteEdit.java b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NoteEdit.java
new file mode 100755
index 000000000..af3a2340d
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NoteEdit.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class NoteEdit extends Activity {
+
+	private EditText mTitleText;
+    private EditText mBodyText;
+    private Long mRowId;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.note_edit);
+       
+        mTitleText = (EditText) findViewById(R.id.title);
+        mBodyText = (EditText) findViewById(R.id.body);
+      
+        Button confirmButton = (Button) findViewById(R.id.confirm);
+       
+        mRowId = null;
+        Bundle extras = getIntent().getExtras();
+        if (extras != null) {
+            String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+            String body = extras.getString(NotesDbAdapter.KEY_BODY);
+            mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+          
+            if (title != null) {
+                mTitleText.setText(title);
+            }
+            if (body != null) {
+                mBodyText.setText(body);
+            }
+        }
+       
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+
+            public void onClick(View view) {
+                Bundle bundle = new Bundle();
+               
+                bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString());
+                bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString());
+                if (mRowId != null) {
+                    bundle.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+                }
+               
+                Intent mIntent = new Intent();
+                mIntent.putExtras(bundle);
+                setResult(RESULT_OK, mIntent);
+                finish();
+            }
+          
+        });
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/Notepadv3.java b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/Notepadv3.java
new file mode 100755
index 000000000..f50f371d8
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/Notepadv3.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")savedInstanceState;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+
+public class Notepadv3 extends ListActivity {
+    private static final int ACTIVITY_CREATE=0;
+    private static final int ACTIVITY_EDIT=1;
+    
+    private static final int INSERT_ID = Menu.FIRST;
+    private static final int DELETE_ID = Menu.FIRST + 1;
+
+    private NotesDbAdapter mDbHelper;
+    private Cursor mNotesCursor;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notes_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+        registerForContextMenu(getListView());
+    }
+    
+    private void fillData() {
+        // Get all of the rows from the database and create the item list
+        mNotesCursor = mDbHelper.fetchAllNotes();
+        startManagingCursor(mNotesCursor);
+        
+        // Create an array to specify the fields we want to display in the list (only TITLE)
+        String[] from = new String[]{NotesDbAdapter.KEY_TITLE};
+        
+        // and an array of the fields we want to bind those fields to (in this case just text1)
+        int[] to = new int[]{R.id.text1};
+        
+        // Now create a simple cursor adapter and set it to display
+        SimpleCursorAdapter notes = 
+        	    new SimpleCursorAdapter(this, R.layout.notes_row, mNotesCursor, from, to);
+        setListAdapter(notes);
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID, 0, R.string.menu_insert);
+        return true;
+    }
+
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        switch(item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+        }
+       
+        return super.onMenuItemSelected(featureId, item);
+    }
+	
+    @Override
+	public void onCreateContextMenu(ContextMenu menu, View v,
+			ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+        menu.add(0, DELETE_ID, 0, R.string.menu_delete);
+	}
+
+    @Override
+	public boolean onContextItemSelected(MenuItem item) {
+		switch(item.getItemId()) {
+    	case DELETE_ID:
+    		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+	        mDbHelper.deleteNote(info.id);
+	        fillData();
+	        return true;
+		}
+		return super.onContextItemSelected(item);
+	}
+	
+    private void createNote() {
+        Intent i = new Intent(this, NoteEdit.class);
+        startActivityForResult(i, ACTIVITY_CREATE);
+    }
+    
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+        Cursor c = mNotesCursor;
+        c.moveToPosition(position);
+        Intent i = new Intent(this, NoteEdit.class);
+        i.putExtra(NotesDbAdapter.KEY_ROWID, id);
+        i.putExtra(NotesDbAdapter.KEY_TITLE, c.getString(
+        		c.getColumnIndexOrThrow(NotesDbAdapter.KEY_TITLE)));
+        i.putExtra(NotesDbAdapter.KEY_BODY, c.getString(
+        		c.getColumnIndexOrThrow(NotesDbAdapter.KEY_BODY)));
+        startActivityForResult(i, ACTIVITY_EDIT);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        Bundle extras = intent.getExtras();
+        switch(requestCode) {
+        case ACTIVITY_CREATE:
+            String title = extras.getString(NotesDbAdapter.KEY_TITLE);
+            String body = extras.getString(NotesDbAdapter.KEY_BODY);
+            mDbHelper.createNote(title, body);
+            fillData();
+            break;
+        case ACTIVITY_EDIT:
+            Long rowId = extras.getLong(NotesDbAdapter.KEY_ROWID);
+            if (rowId != null) {
+                String editTitle = extras.getString(NotesDbAdapter.KEY_TITLE);
+                String editBody = extras.getString(NotesDbAdapter.KEY_BODY);
+                mDbHelper.updateNote(rowId, editTitle, editBody);
+            }
+            fillData();
+            break;
+        }
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NotesDbAdapter.java
new file mode 100755
index 000000000..61ad04623
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3/src/com/android/demo/notepad3/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/AndroidManifest.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/AndroidManifest.xml
new file mode 100755
index 000000000..adb07ffdb
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/AndroidManifest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.demo.notepad3">
+    <application android:icon="@drawable/icon">
+        <activity android:name=".Notepadv3" 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=".NoteEdit"/>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/drawable/icon.png b/tutorials/NotepadCodeLab/Notepadv3Solution/res/drawable/icon.png
new file mode 100755
index 0000000000000000000000000000000000000000..64e3601c234d3818409fb5daad54b099b76e9a04
GIT binary patch
literal 6094
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
U$@ynO6#xJL07*qoM6N<$f@Zv%aR2}S

literal 0
HcmV?d00001

diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml
new file mode 100755
index 000000000..b254552c3
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/note_edit.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+	
+	<LinearLayout android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:text="@string/title" />
+		<EditText android:id="@+id/title" 
+		  android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_weight="1"/>
+	</LinearLayout>
+
+	<TextView android:layout_width="wrap_content"
+		android:layout_height="wrap_content" 
+		android:text="@string/body" />
+	<EditText android:id="@+id/body" android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1"
+		android:scrollbars="vertical" />
+	
+	<Button android:id="@+id/confirm" 
+	  android:text="@string/confirm"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml
new file mode 100755
index 000000000..29ae88631
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="wrap_content"
+    	android:layout_height="wrap_content">
+    
+    <ListView android:id="@+id/android:list"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"/>
+  	<TextView android:id="@+id/android:empty"
+          android:layout_width="wrap_content"
+        	android:layout_height="wrap_content"
+        	android:text="No Notes!"/>
+</LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_row.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_row.xml
new file mode 100755
index 000000000..f28a41bea
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_row.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/text1" xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/values/strings.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/values/strings.xml
new file mode 100755
index 000000000..ae63b837d
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/values/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Notepad v3</string>
+    <string name="no_notes">No Notes Yet</string>
+    <string name="menu_insert">Add Note</string>
+    <string name="menu_delete">Delete Note</string>
+    <string name="title">Title</string>
+    <string name="body">Body</string>
+    <string name="confirm">Confirm</string>
+    <string name="edit_note">Edit Note</string>
+</resources>
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java
new file mode 100755
index 000000000..710ea339d
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.app.Activity;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class NoteEdit extends Activity {
+
+	private EditText mTitleText;
+    private EditText mBodyText;
+    private Long mRowId;
+    private NotesDbAdapter mDbHelper;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        setContentView(R.layout.note_edit);
+        
+       
+        mTitleText = (EditText) findViewById(R.id.title);
+        mBodyText = (EditText) findViewById(R.id.body);
+      
+        Button confirmButton = (Button) findViewById(R.id.confirm);
+       
+        mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) 
+                							: null;
+		if (mRowId == null) {
+			Bundle extras = getIntent().getExtras();            
+			mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) 
+									: null;
+		}
+
+		populateFields();
+		
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+
+        	public void onClick(View view) {
+        	    setResult(RESULT_OK);
+        	    finish();
+        	}
+          
+        });
+    }
+    
+    private void populateFields() {
+        if (mRowId != null) {
+            Cursor note = mDbHelper.fetchNote(mRowId);
+            startManagingCursor(note);
+            mTitleText.setText(note.getString(
+    	            note.getColumnIndexOrThrow(NotesDbAdapter.KEY_TITLE)));
+            mBodyText.setText(note.getString(
+                    note.getColumnIndexOrThrow(NotesDbAdapter.KEY_BODY)));
+        }
+    }
+    
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+    }
+    
+    @Override
+    protected void onPause() {
+        super.onPause();
+        saveState();
+    }
+    
+    @Override
+    protected void onResume() {
+        super.onResume();
+        populateFields();
+    }
+    
+    private void saveState() {
+        String title = mTitleText.getText().toString();
+        String body = mBodyText.getText().toString();
+
+        if (mRowId == null) {
+            long id = mDbHelper.createNote(title, body);
+            if (id > 0) {
+                mRowId = id;
+            }
+        } else {
+            mDbHelper.updateNote(mRowId, title, body);
+        }
+    }
+    
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/Notepadv3.java b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/Notepadv3.java
new file mode 100755
index 000000000..7f9903750
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/Notepadv3.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")savedInstanceState;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.app.ListActivity;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import android.view.ContextMenu;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+
+public class Notepadv3 extends ListActivity {
+    private static final int ACTIVITY_CREATE=0;
+    private static final int ACTIVITY_EDIT=1;
+    
+    private static final int INSERT_ID = Menu.FIRST;
+    private static final int DELETE_ID = Menu.FIRST + 1;
+
+    private NotesDbAdapter mDbHelper;
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.notes_list);
+        mDbHelper = new NotesDbAdapter(this);
+        mDbHelper.open();
+        fillData();
+        registerForContextMenu(getListView());
+    }
+    
+    private void fillData() {
+        Cursor notesCursor = mDbHelper.fetchAllNotes();
+        startManagingCursor(notesCursor);
+        
+        // Create an array to specify the fields we want to display in the list (only TITLE)
+        String[] from = new String[]{NotesDbAdapter.KEY_TITLE};
+        
+        // and an array of the fields we want to bind those fields to (in this case just text1)
+        int[] to = new int[]{R.id.text1};
+        
+        // Now create a simple cursor adapter and set it to display
+        SimpleCursorAdapter notes = 
+        	    new SimpleCursorAdapter(this, R.layout.notes_row, notesCursor, from, to);
+        setListAdapter(notes);
+    }
+    
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        menu.add(0, INSERT_ID, 0, R.string.menu_insert);
+        return true;
+    }
+
+    @Override
+    public boolean onMenuItemSelected(int featureId, MenuItem item) {
+        switch(item.getItemId()) {
+        case INSERT_ID:
+            createNote();
+            return true;
+        }
+       
+        return super.onMenuItemSelected(featureId, item);
+    }
+	
+    @Override
+	public void onCreateContextMenu(ContextMenu menu, View v,
+			ContextMenuInfo menuInfo) {
+		super.onCreateContextMenu(menu, v, menuInfo);
+        menu.add(0, DELETE_ID, 0, R.string.menu_delete);
+	}
+
+    @Override
+	public boolean onContextItemSelected(MenuItem item) {
+		switch(item.getItemId()) {
+    	case DELETE_ID:
+    		AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
+	        mDbHelper.deleteNote(info.id);
+	        fillData();
+	        return true;
+		}
+		return super.onContextItemSelected(item);
+	}
+	
+    private void createNote() {
+        Intent i = new Intent(this, NoteEdit.class);
+        startActivityForResult(i, ACTIVITY_CREATE);
+    }
+    
+    @Override
+    protected void onListItemClick(ListView l, View v, int position, long id) {
+        super.onListItemClick(l, v, position, id);
+        Intent i = new Intent(this, NoteEdit.class);
+        i.putExtra(NotesDbAdapter.KEY_ROWID, id);
+        startActivityForResult(i, ACTIVITY_EDIT);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, 
+                                    Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        fillData();
+    }
+}
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NotesDbAdapter.java b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NotesDbAdapter.java
new file mode 100755
index 000000000..61ad04623
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NotesDbAdapter.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.android.demo.notepad3;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.SQLException;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+/**
+ * Simple notes database access helper class. Defines the basic CRUD operations
+ * for the notepad example, and gives the ability to list all notes as well as
+ * retrieve or modify a specific note.
+ * 
+ * This has been improved from the first version of this tutorial through the
+ * addition of better error handling and also using returning a Cursor instead
+ * of using a collection of inner classes (which is less scalable and not
+ * recommended).
+ */
+public class NotesDbAdapter {
+
+    public static final String KEY_TITLE = "title";
+    public static final String KEY_BODY = "body";
+    public static final String KEY_ROWID = "_id";
+
+    private static final String TAG = "NotesDbAdapter";
+    private DatabaseHelper mDbHelper;
+    private SQLiteDatabase mDb;
+    
+    /**
+     * Database creation sql statement
+     */
+    private static final String DATABASE_CREATE =
+            "create table notes (_id integer primary key autoincrement, "
+                    + "title text not null, body text not null);";
+
+    private static final String DATABASE_NAME = "data";
+    private static final String DATABASE_TABLE = "notes";
+    private static final int DATABASE_VERSION = 2;
+
+    private final Context mCtx;
+
+    private static class DatabaseHelper extends SQLiteOpenHelper {
+
+        DatabaseHelper(Context context) {
+            super(context, DATABASE_NAME, null, DATABASE_VERSION);
+        }
+
+        @Override
+        public void onCreate(SQLiteDatabase db) {
+
+            db.execSQL(DATABASE_CREATE);
+        }
+
+        @Override
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+            Log.w(TAG, "Upgrading database from version " + oldVersion + " to "
+                    + newVersion + ", which will destroy all old data");
+            db.execSQL("DROP TABLE IF EXISTS notes");
+            onCreate(db);
+        }
+    }
+
+    /**
+     * Constructor - takes the context to allow the database to be
+     * opened/created
+     * 
+     * @param ctx the Context within which to work
+     */
+    public NotesDbAdapter(Context ctx) {
+        this.mCtx = ctx;
+    }
+
+    /**
+     * Open the notes database. If it cannot be opened, try to create a new
+     * instance of the database. If it cannot be created, throw an exception to
+     * signal the failure
+     * 
+     * @return this (self reference, allowing this to be chained in an
+     *         initialization call)
+     * @throws SQLException if the database could be neither opened or created
+     */
+    public NotesDbAdapter open() throws SQLException {
+        mDbHelper = new DatabaseHelper(mCtx);
+        mDb = mDbHelper.getWritableDatabase();
+        return this;
+    }
+    
+    public void close() {
+        mDbHelper.close();
+    }
+
+
+    /**
+     * Create a new note using the title and body provided. If the note is
+     * successfully created return the new rowId for that note, otherwise return
+     * a -1 to indicate failure.
+     * 
+     * @param title the title of the note
+     * @param body the body of the note
+     * @return rowId or -1 if failed
+     */
+    public long createNote(String title, String body) {
+        ContentValues initialValues = new ContentValues();
+        initialValues.put(KEY_TITLE, title);
+        initialValues.put(KEY_BODY, body);
+
+        return mDb.insert(DATABASE_TABLE, null, initialValues);
+    }
+
+    /**
+     * Delete the note with the given rowId
+     * 
+     * @param rowId id of note to delete
+     * @return true if deleted, false otherwise
+     */
+    public boolean deleteNote(long rowId) {
+
+        return mDb.delete(DATABASE_TABLE, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+
+    /**
+     * Return a Cursor over the list of all notes in the database
+     * 
+     * @return Cursor over all notes
+     */
+    public Cursor fetchAllNotes() {
+
+        return mDb.query(DATABASE_TABLE, new String[] {KEY_ROWID, KEY_TITLE,
+                KEY_BODY}, null, null, null, null, null);
+    }
+
+    /**
+     * Return a Cursor positioned at the note that matches the given rowId
+     * 
+     * @param rowId id of note to retrieve
+     * @return Cursor positioned to matching note, if found
+     * @throws SQLException if note could not be found/retrieved
+     */
+    public Cursor fetchNote(long rowId) throws SQLException {
+
+        Cursor mCursor =
+
+                mDb.query(true, DATABASE_TABLE, new String[] {KEY_ROWID,
+                        KEY_TITLE, KEY_BODY}, KEY_ROWID + "=" + rowId, null,
+                        null, null, null, null);
+        if (mCursor != null) {
+            mCursor.moveToFirst();
+        }
+        return mCursor;
+
+    }
+
+    /**
+     * Update the note using the details provided. The note to be updated is
+     * specified using the rowId, and it is altered to use the title and body
+     * values passed in
+     * 
+     * @param rowId id of note to update
+     * @param title value to set note title to
+     * @param body value to set note body to
+     * @return true if the note was successfully updated, false otherwise
+     */
+    public boolean updateNote(long rowId, String title, String body) {
+        ContentValues args = new ContentValues();
+        args.put(KEY_TITLE, title);
+        args.put(KEY_BODY, body);
+
+        return mDb.update(DATABASE_TABLE, args, KEY_ROWID + "=" + rowId, null) > 0;
+    }
+}

From f4ff28edda30f72984eeb50a9153879c1e5f0abb Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Thu, 10 Dec 2009 15:19:03 -0800
Subject: [PATCH 12/17] Cleanup one of the ListView sample demos.

---
 samples/ApiDemos/res/layout/list_7.xml        |  4 +-
 .../com/example/android/apis/view/List7.java  | 64 ++++++++++++-------
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/samples/ApiDemos/res/layout/list_7.xml b/samples/ApiDemos/res/layout/list_7.xml
index 2dc777707..dfaf093e7 100644
--- a/samples/ApiDemos/res/layout/list_7.xml
+++ b/samples/ApiDemos/res/layout/list_7.xml
@@ -20,7 +20,7 @@
     android:layout_height="fill_parent"
 	android:paddingLeft="8dip"
 	android:paddingRight="8dip">
-	
+
 	<ListView android:id="@android:id/list"
 	    android:layout_width="fill_parent" 
 	    android:layout_height="0dip"
@@ -31,5 +31,5 @@
     	android:layout_width="fill_parent" 
     	android:layout_height="wrap_content"
     	android:background="@drawable/blue"/>
-    	
+
 </LinearLayout>
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/List7.java b/samples/ApiDemos/src/com/example/android/apis/view/List7.java
index d44ed5672..e773db62a 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/List7.java
+++ b/samples/ApiDemos/src/com/example/android/apis/view/List7.java
@@ -16,15 +16,12 @@
 
 package com.example.android.apis.view;
 
-// Need the following import to get access to the app resources, since this
-// class is in a sub-package.
 import com.example.android.apis.R;
 
-
 import android.app.ListActivity;
 import android.database.Cursor;
-import android.provider.Contacts.People;
 import android.os.Bundle;
+import android.provider.ContactsContract;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
@@ -36,46 +33,69 @@ import android.widget.TextView;
  * A list view example where the data comes from a cursor.
  */
 public class List7 extends ListActivity implements OnItemSelectedListener {
-    private static String[] PROJECTION = new String[] {
-        People._ID, People.NAME, People.NUMBER
+    private static final String[] PROJECTION = new String[] {
+            ContactsContract.Contacts._ID,
+            ContactsContract.Contacts.DISPLAY_NAME,
+            ContactsContract.Contacts.HAS_PHONE_NUMBER,
+            ContactsContract.Contacts.LOOKUP_KEY
     };
 
+    private int mIdColumnIndex;
+    private int mHasPhoneColumnIndex;
+
+    private TextView mPhone;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         setContentView(R.layout.list_7);
+
         mPhone = (TextView) findViewById(R.id.phone);
         getListView().setOnItemSelectedListener(this);
 
         // Get a cursor with all people
-        Cursor c = getContentResolver().query(People.CONTENT_URI, PROJECTION, null, null, null);
-        startManagingCursor(c);
-        mPhoneColumnIndex = c.getColumnIndex(People.NUMBER);
+        Cursor c = managedQuery(ContactsContract.Contacts.CONTENT_URI,
+                PROJECTION, null, null, null);
+        mIdColumnIndex = c.getColumnIndex(ContactsContract.Contacts._ID);
+        mHasPhoneColumnIndex = c.getColumnIndex(ContactsContract.Contacts.HAS_PHONE_NUMBER);
 
         ListAdapter adapter = new SimpleCursorAdapter(this,
                 android.R.layout.simple_list_item_1, // Use a template
-                                                        // that displays a
-                                                        // text view
-                c, // Give the cursor to the list adatper
-                new String[] {People.NAME}, // Map the NAME column in the
-                                            // people database to...
-                new int[] {android.R.id.text1}); // The "text1" view defined in
-                                            // the XML template
+                                                     // that displays a
+                                                     // text view
+                c, // Give the cursor to the list adapter
+                new String[] { ContactsContract.Contacts.DISPLAY_NAME }, // Map the NAME column in the
+                                                                         // people database to...
+                new int[] { android.R.id.text1 }); // The "text1" view defined in
+                                                   // the XML template
         setListAdapter(adapter);
     }
 
     public void onItemSelected(AdapterView parent, View v, int position, long id) {
         if (position >= 0) {
-            Cursor c = (Cursor) parent.getItemAtPosition(position);
-            mPhone.setText(c.getString(mPhoneColumnIndex));
+            final Cursor c = (Cursor) parent.getItemAtPosition(position);
+            if (c.getInt(mHasPhoneColumnIndex) > 0) {
+                final long contactId = c.getLong(mIdColumnIndex);
+                final Cursor phones = getContentResolver().query(
+                        ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+                        new String[] { ContactsContract.CommonDataKinds.Phone.NUMBER },
+                        ContactsContract.CommonDataKinds.Phone.CONTACT_ID + "=" + contactId, null,
+                        ContactsContract.CommonDataKinds.Phone.IS_SUPER_PRIMARY + " DESC");
+
+                try {
+                    phones.moveToFirst();
+                    mPhone.setText(phones.getString(0));
+                } finally {
+                    phones.close();
+                }
+            } else {
+                mPhone.setText(R.string.list_7_nothing);                
+            }
         }
     }
 
     public void onNothingSelected(AdapterView parent) {
         mPhone.setText(R.string.list_7_nothing);
-
     }
-
-    private int mPhoneColumnIndex;
-    private TextView mPhone;
 }

From 5a3963887519fcfe1f7e8b1dfe552cb3977fad84 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Thu, 10 Dec 2009 16:54:52 -0800
Subject: [PATCH 13/17] Add new samples to the SDK.

Change-Id: I9fb303e6b6f6fb00172f4f5bf64a2c56649c2491
---
 build/sdk.atree | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/sdk.atree b/build/sdk.atree
index 6696deb51..f03d35484 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -83,6 +83,10 @@ development/samples/Snake platforms/${PLATFORM_NAME}/samples/Snake
 development/samples/SoftKeyboard platforms/${PLATFORM_NAME}/samples/SoftKeyboard
 development/samples/JetBoy platforms/${PLATFORM_NAME}/samples/JetBoy
 development/samples/SearchableDictionary platforms/${PLATFORM_NAME}/samples/SearchableDictionary
+development/samples/ContactManager platforms/${PLATFORM_NAME}/samples/ContactManager
+development/samples/MultiResolution platforms/${PLATFORM_NAME}/samples/MultiResolution
+development/samples/Wiktionary platforms/${PLATFORM_NAME}/samples/Wiktionary
+development/samples/WiktionarySimple platforms/${PLATFORM_NAME}/samples/WiktionarySimple
 
 # dx
 bin/dx platforms/${PLATFORM_NAME}/tools/dx

From f2519b444f658d2d7af8f85b0b95d12f32cf8bd2 Mon Sep 17 00:00:00 2001
From: Tom O'Neill <tomo@google.com>
Date: Fri, 11 Dec 2009 11:25:36 -0800
Subject: [PATCH 14/17] Add Android.mk files for the Notepad tutorial's
 solutions

Now the tutorial is built as part of the standard build, but not installed
as part of the system image.  Required localizing an android:text field
that was already localized in Notepadv1 but for some odd reason was no
longer localized in v2 and v3.

Change-Id: I0e1b41a4efa454a503b788b0698593136662a014
---
 .../Notepadv1Solution/Android.mk              | 30 +++++++++++++++++++
 .../Notepadv2/res/layout/notes_list.xml       |  2 +-
 .../Notepadv2Solution/Android.mk              | 30 +++++++++++++++++++
 .../res/layout/notes_list.xml                 |  2 +-
 .../Notepadv3/res/layout/notes_list.xml       |  2 +-
 .../Notepadv3Solution/Android.mk              | 30 +++++++++++++++++++
 .../res/layout/notes_list.xml                 |  2 +-
 7 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 tutorials/NotepadCodeLab/Notepadv1Solution/Android.mk
 create mode 100644 tutorials/NotepadCodeLab/Notepadv2Solution/Android.mk
 create mode 100644 tutorials/NotepadCodeLab/Notepadv3Solution/Android.mk

diff --git a/tutorials/NotepadCodeLab/Notepadv1Solution/Android.mk b/tutorials/NotepadCodeLab/Notepadv1Solution/Android.mk
new file mode 100644
index 000000000..537503105
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv1Solution/Android.mk
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := Notepadv1Solution
+
+# Make the app build against the current SDK
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml
index 29ae88631..6ae04729e 100755
--- a/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml
+++ b/tutorials/NotepadCodeLab/Notepadv2/res/layout/notes_list.xml
@@ -9,5 +9,5 @@
   	<TextView android:id="@+id/android:empty"
           android:layout_width="wrap_content"
         	android:layout_height="wrap_content"
-        	android:text="No Notes!"/>
+        	android:text="@string/no_notes"/>
 </LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/Android.mk b/tutorials/NotepadCodeLab/Notepadv2Solution/Android.mk
new file mode 100644
index 000000000..8e483519b
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/Android.mk
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := Notepadv2Solution
+
+# Make the app build against the current SDK
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml
index 29ae88631..6ae04729e 100755
--- a/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml
+++ b/tutorials/NotepadCodeLab/Notepadv2Solution/res/layout/notes_list.xml
@@ -9,5 +9,5 @@
   	<TextView android:id="@+id/android:empty"
           android:layout_width="wrap_content"
         	android:layout_height="wrap_content"
-        	android:text="No Notes!"/>
+        	android:text="@string/no_notes"/>
 </LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml
index 29ae88631..6ae04729e 100755
--- a/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml
+++ b/tutorials/NotepadCodeLab/Notepadv3/res/layout/notes_list.xml
@@ -9,5 +9,5 @@
   	<TextView android:id="@+id/android:empty"
           android:layout_width="wrap_content"
         	android:layout_height="wrap_content"
-        	android:text="No Notes!"/>
+        	android:text="@string/no_notes"/>
 </LinearLayout>
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/Android.mk b/tutorials/NotepadCodeLab/Notepadv3Solution/Android.mk
new file mode 100644
index 000000000..177164ed8
--- /dev/null
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/Android.mk
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2009 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+# Only compile source java files in this apk.
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := Notepadv3Solution
+
+# Make the app build against the current SDK
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_PACKAGE)
diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml
index 29ae88631..6ae04729e 100755
--- a/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/res/layout/notes_list.xml
@@ -9,5 +9,5 @@
   	<TextView android:id="@+id/android:empty"
           android:layout_width="wrap_content"
         	android:layout_height="wrap_content"
-        	android:text="No Notes!"/>
+        	android:text="@string/no_notes"/>
 </LinearLayout>

From ecef8139decf8ff101c6bea2c7c89b4e3ff8ca38 Mon Sep 17 00:00:00 2001
From: vchtchetkine <vchtchetkine@google.com>
Date: Fri, 11 Dec 2009 07:14:38 -0800
Subject: [PATCH 15/17] Fixed

---
 host/windows/usb/android_winusb.inf | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index f88af7e97..54f7aa2e1 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -34,11 +34,14 @@ HKR,,Icon,,-1
 %CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
 ;
 ;Moto Sholes
-%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D
-%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0002
-%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0002&MI_01
 %SingleAdbInterface%        = USB_Install, USB\VID_22B8&PID_41DB
 %CompositeAdbInterface%     = USB_Install, USB\VID_22B8&PID_41DB&MI_01
+;
+;Google NexusOne
+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0D02
+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0D02&MI_01
+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_4E11
+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E12&MI_01
 
 [Google.NTamd64]
 ; HTC Dream
@@ -49,11 +52,14 @@ HKR,,Icon,,-1
 %CompositeAdbInterface%     = USB_Install, USB\VID_0BB4&PID_0C03&MI_01
 ;
 ;Moto Sholes
-%SingleBootLoaderInterface% = USB_Install, USB\VID_18D1&PID_D00D
-%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0002
-%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0002&MI_01
 %SingleAdbInterface%        = USB_Install, USB\VID_22B8&PID_41DB
 %CompositeAdbInterface%     = USB_Install, USB\VID_22B8&PID_41DB&MI_01
+;
+;Google NexusOne
+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_0D02
+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_0D02&MI_01
+%SingleAdbInterface%        = USB_Install, USB\VID_18D1&PID_4E11
+%CompositeAdbInterface%     = USB_Install, USB\VID_18D1&PID_4E12&MI_01
 
 [USB_Install]
 Include = winusb.inf

From d0225ee63f305ef59e17f8ad0dc16b2ef5e85af0 Mon Sep 17 00:00:00 2001
From: Dan Egnor <egnor@google.com>
Date: Wed, 9 Dec 2009 16:30:23 -0800
Subject: [PATCH 16/17] Remove the old Dev Tools exception browser (since it
 relies on now eliminated checkin database crash storage functionality).

Add a new test app to Dev Tools, "Bad Behavior", which has
buttons to crash and generate an ANR on command.

Update the Monkey to follow changed APIs.
---
 apps/Development/AndroidManifest.xml          |  33 ++--
 apps/Development/res/layout/bad_behavior.xml  |  37 ++++
 apps/Development/res/values/strings.xml       |   5 +
 .../development/BadBehaviorActivity.java      |  63 +++++++
 .../android/development/ExceptionBrowser.java | 171 ------------------
 .../android/development/StacktraceViewer.java |  50 -----
 .../com/android/commands/monkey/Monkey.java   |  28 +--
 7 files changed, 131 insertions(+), 256 deletions(-)
 create mode 100644 apps/Development/res/layout/bad_behavior.xml
 create mode 100644 apps/Development/src/com/android/development/BadBehaviorActivity.java
 delete mode 100644 apps/Development/src/com/android/development/ExceptionBrowser.java
 delete mode 100644 apps/Development/src/com/android/development/StacktraceViewer.java

diff --git a/apps/Development/AndroidManifest.xml b/apps/Development/AndroidManifest.xml
index 31427a59a..07a4213b3 100644
--- a/apps/Development/AndroidManifest.xml
+++ b/apps/Development/AndroidManifest.xml
@@ -58,13 +58,6 @@
                 <category android:name="android.intent.category.TEST" />
             </intent-filter>
         </activity>
-        <activity android:name="ExceptionBrowser" android:label="Exception Browser">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.TEST" />
-            </intent-filter>
-        </activity>
-        <activity android:name="StacktraceViewer" android:label="Stacktrace Viewer"/>
         <activity android:name="PackageSummary" android:label="Package Summary">
         </activity>
         <activity android:name="ShowActivity" android:label="Activity">
@@ -128,44 +121,50 @@
             </intent-filter>
         </activity>
 
-    <activity android:name="GLSTester" android:label="Google Login Service">
+        <activity android:name="GLSTester" android:label="Google Login Service">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.TEST" />
             </intent-filter>
         </activity>
 
-    <activity android:name="RunningProcesses" android:label="Running processes">
+        <activity android:name="RunningProcesses" android:label="Running processes">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.TEST" />
             </intent-filter>
         </activity>
-    <activity android:name="ProcessInfo" android:label="Process Information">
+        <activity android:name="ProcessInfo" android:label="Process Information">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-    </activity>
+        </activity>
     <!--
-    <activity android:name="AppHwConfigList" android:label="Applications Hw Configuration">
+        <activity android:name="AppHwConfigList" android:label="Applications Hw Configuration">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.TEST" />
             </intent-filter>
-    </activity>
+        </activity>
     -->
-    <activity android:name="AppHwPref" android:label="Applications Hardware Preferences">
+        <activity android:name="AppHwPref" android:label="Applications Hardware Preferences">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-    </activity>
-    <activity android:name="PermissionDetails" android:label="Permission Info">
+        </activity>
+        <activity android:name="PermissionDetails" android:label="Permission Info">
             <intent-filter>
                 <action android:name="com.android.development.VIEW_PERMISSION" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-    </activity>
+        </activity>
+        <activity android:name="BadBehaviorActivity" android:label="Bad Behavior">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.TEST" />
+            </intent-filter>
+        </activity>
     </application>
 </manifest>
diff --git a/apps/Development/res/layout/bad_behavior.xml b/apps/Development/res/layout/bad_behavior.xml
new file mode 100644
index 000000000..62a724502
--- /dev/null
+++ b/apps/Development/res/layout/bad_behavior.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+
+    <Button android:id="@+id/bad_behavior_crash_main"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bad_behavior_crash_main_label" />
+
+    <Button android:id="@+id/bad_behavior_crash_thread"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bad_behavior_crash_thread_label" />
+
+    <Button android:id="@+id/bad_behavior_anr"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/bad_behavior_anr_label" />
+
+</LinearLayout>
diff --git a/apps/Development/res/values/strings.xml b/apps/Development/res/values/strings.xml
index 350f74db7..cb41087f8 100644
--- a/apps/Development/res/values/strings.xml
+++ b/apps/Development/res/values/strings.xml
@@ -193,4 +193,9 @@
     <string name="binding_bind_failed">Bind failed</string>
     <string name="binding_waiting_for_connection">Waiting for service to be connected...</string>
     <string name="select_account_to_sync">Select account to sync</string>
+
+    <!-- BadBehaviorActivity -->
+    <string name="bad_behavior_crash_main_label">Crash the main thread</string>
+    <string name="bad_behavior_crash_thread_label">Crash an auxiliary thread</string>
+    <string name="bad_behavior_anr_label">Stop responding for 20 seconds (ANR)</string>
 </resources>
diff --git a/apps/Development/src/com/android/development/BadBehaviorActivity.java b/apps/Development/src/com/android/development/BadBehaviorActivity.java
new file mode 100644
index 000000000..b8f47216a
--- /dev/null
+++ b/apps/Development/src/com/android/development/BadBehaviorActivity.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.development;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.Button;
+import android.view.View;
+
+public class BadBehaviorActivity extends Activity {
+    static class BadBehaviorException extends RuntimeException {
+        BadBehaviorException() {
+            super("Whatcha gonna do, whatcha gonna do",
+                    new IllegalStateException("When they come for you"));
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.bad_behavior);
+
+        Button crash_main = (Button) findViewById(R.id.bad_behavior_crash_main);
+        crash_main.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) { throw new BadBehaviorException(); }
+        });
+
+        Button crash_thread = (Button) findViewById(R.id.bad_behavior_crash_thread);
+        crash_thread.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                new Thread() {
+                    @Override
+                    public void run() { throw new BadBehaviorException(); }
+                }.start();
+            }
+        });
+
+        Button anr = (Button) findViewById(R.id.bad_behavior_anr);
+        anr.setOnClickListener(new View.OnClickListener() {
+            public void onClick(View v) {
+                try {
+                    Thread.sleep(20000);
+                } catch (InterruptedException e) {
+                    throw new IllegalStateException(e);
+                }
+            }
+        });
+    }
+}
diff --git a/apps/Development/src/com/android/development/ExceptionBrowser.java b/apps/Development/src/com/android/development/ExceptionBrowser.java
deleted file mode 100644
index 63270aab5..000000000
--- a/apps/Development/src/com/android/development/ExceptionBrowser.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
-
-package com.android.development;
-
-import android.app.ListActivity;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.database.ContentObserver;
-import android.database.DataSetObserver;
-import android.graphics.Typeface;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.provider.Checkin;
-import android.server.data.CrashData;
-import android.server.data.ThrowableData;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.KeyEvent;
-import android.widget.*;
-
-import org.apache.commons.codec.binary.Base64;
-
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-
-/**
- *
- *
- */
-public class ExceptionBrowser extends ListActivity {
-    /** Logging identifier. */
-    private static final String TAG = "ExceptionBrowser";
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        Cursor cursor = getContentResolver().query(
-                Checkin.Crashes.CONTENT_URI,
-                new String[] { Checkin.Crashes._ID, Checkin.Crashes.DATA },
-                null, null, null);
-
-        if (cursor != null) {
-            startManagingCursor(cursor);
-
-            setListAdapter(new CursorAdapter(this, cursor, true) {
-                public View newView(Context context, Cursor c, ViewGroup v) {
-                    return new CrashListItem(context);
-                }
-
-                public void bindView(View view, Context c, Cursor cursor) {
-                    CrashListItem item = (CrashListItem) view;
-                    try {
-                        String data = cursor.getString(1);
-                        CrashData crash = new CrashData(
-                            new DataInputStream(
-                                new ByteArrayInputStream(
-                                    Base64.decodeBase64(data.getBytes()))));
-
-                        ThrowableData exc = crash.getThrowableData();
-                        item.setText(exc.getType() + ": " + exc.getMessage());
-                        item.setCrashData(crash);
-                    } catch (IOException e) {
-                        item.setText("Invalid crash: " + e);
-                        Log.e(TAG, "Invalid crash", e);
-                    }
-                }
-            });
-        } else {
-            // No database, no exceptions, empty list.
-            setListAdapter(new BaseAdapter() {
-                public int getCount() {
-                    return 0;
-                }
-
-                public Object getItem(int position) {
-                    throw new AssertionError();
-                }
-
-                public long getItemId(int position) {
-                    throw new AssertionError();
-                }
-
-                public View getView(int position, View convertView,
-                        ViewGroup parent) {
-                    throw new AssertionError();
-                }
-            });
-        }
-    }
-
-    private static final int UPLOAD_ID = Menu.FIRST;
-    private static final int CLEAR_ID = Menu.FIRST + 1;
-
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-
-        menu.add(0, UPLOAD_ID, 0, R.string.menu_upload_exceptions);
-        menu.add(0, CLEAR_ID, 0, R.string.menu_clear_exceptions);
-
-        return true;
-    }
-
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle all of the possible menu actions.
-        switch (item.getItemId()) {
-            case UPLOAD_ID:
-                sendBroadcast(new Intent(Checkin.TriggerIntent.ACTION));
-                break;
-            case CLEAR_ID:
-                getContentResolver().delete(
-                        Checkin.Crashes.CONTENT_URI, null, null);
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    static class CrashListItem extends TextView {
-        CrashData crashData = null;
-
-        public CrashListItem(Context context) {
-            super(context);
-            setTextSize(10);
-            setTypeface(Typeface.MONOSPACE);
-        }
-
-        public CrashData getCrashData() {
-            return crashData;
-        }
-
-        public void setCrashData(CrashData crashData) {
-            this.crashData = crashData;
-        }
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View view, int pos, long id) {
-        // TODO: Use a generic VIEW action on the crash's content URI.
-        CrashData crash = ((CrashListItem) view).getCrashData();
-        if (crash != null) {
-            Intent intent = new Intent();
-            intent.setClass(this, StacktraceViewer.class);
-            intent.putExtra(
-                    CrashData.class.getName(),
-                    crash.getThrowableData().toString());
-            startActivity(intent);
-        }
-    }
-}
diff --git a/apps/Development/src/com/android/development/StacktraceViewer.java b/apps/Development/src/com/android/development/StacktraceViewer.java
deleted file mode 100644
index 96b052129..000000000
--- a/apps/Development/src/com/android/development/StacktraceViewer.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
-
-package com.android.development;
-
-
-import android.app.Activity;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.text.method.ScrollingMovementMethod;
-import android.os.Bundle;
-import android.server.data.CrashData;
-import android.server.data.ThrowableData;
-import android.server.data.StackTraceElementData;
-import android.graphics.Typeface;
-
-/**
- * Views a single stack trace.
- */
-public class StacktraceViewer extends Activity {
-
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.log_viewer);
-
-        TextView text = (TextView) findViewById(R.id.text);
-        text.setTextSize(10);
-        text.setHorizontallyScrolling(true);
-        text.setTypeface(Typeface.MONOSPACE);
-        text.setMovementMethod(ScrollingMovementMethod.getInstance());
-        
-        String stacktrace = getIntent().getExtras().getString(
-                CrashData.class.getName());
-
-        text.setText(stacktrace);
-    }
-}
diff --git a/cmds/monkey/src/com/android/commands/monkey/Monkey.java b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
index bb0663fd3..19f6d8be2 100644
--- a/cmds/monkey/src/com/android/commands/monkey/Monkey.java
+++ b/cmds/monkey/src/com/android/commands/monkey/Monkey.java
@@ -23,11 +23,11 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.IPackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.Build;
 import android.os.Debug;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
-import android.server.data.CrashData;
 import android.view.IWindowManager;
 
 import java.io.BufferedReader;
@@ -209,26 +209,18 @@ public class Monkey {
             }
         }
 
-        public boolean appCrashed(String processName, int pid, String shortMsg, String longMsg,
-                byte[] crashData) {
+        public boolean appCrashed(String processName, int pid,
+                String tag, String shortMsg, String longMsg,
+                long timeMillis, String stackTrace) {
             System.err.println("// CRASH: " + processName + " (pid " + pid + ")");
             System.err.println("// Short Msg: " + shortMsg);
             System.err.println("// Long Msg: " + longMsg);
-            if (crashData != null) {
-                try {
-                    CrashData cd = new CrashData(new DataInputStream(new ByteArrayInputStream(
-                            crashData)));
-                    System.err.println("// Build Label: " + cd.getBuildData().getFingerprint());
-                    System.err.println("// Build Changelist: "
-                            + cd.getBuildData().getIncrementalVersion());
-                    System.err.println("// Build Time: " + cd.getBuildData().getTime());
-                    System.err.println("// ID: " + cd.getId());
-                    System.err.println("// Tag: " + cd.getActivity());
-                    System.err.println(cd.getThrowableData().toString("// "));
-                } catch (IOException e) {
-                    System.err.println("// BAD STACK CRAWL");
-                }
-            }
+            System.err.println("// Build Label: " + Build.FINGERPRINT);
+            System.err.println("// Build Changelist: " + Build.VERSION.INCREMENTAL);
+            System.err.println("// Build Time: " + Build.TIME);
+            System.err.println("// ID: ");  // TODO: This was never set -- remove?
+            System.err.println("// Tag: " + tag);
+            System.err.println("// " + stackTrace.replace("\n", "\n// "));
 
             if (!mIgnoreCrashes) {
                 synchronized (Monkey.this) {

From 7c21d1cd4051a7aaab5c15d63649315708c6aaa4 Mon Sep 17 00:00:00 2001
From: Tom O'Neill <tomo@google.com>
Date: Fri, 11 Dec 2009 16:01:04 -0800
Subject: [PATCH 17/17] Fix Notepadv3Solution orientation changes during
 NoteEdit

The current NoteEdit.java in Notepadv3Solution crashes on NPE when the
screen orientation changes.  This happens because a null Long is
auto-unboxed to a long when used as an input to
Bundle.putLong(String, long).  The easiest solution is to use
Bundle.putSerializable() instead.

In addition duplicate notepad entries could result because mRowId was not
necessarily defined when onSaveInstanceState(Bundle) was called.  The
solution to that is to call saveState() in that method.

Fixes these buganizer bugs:

Change-Id: Ice325f3b089867e4716deb48aefe8ec03f30ad55
http://b/issue?id=2266994
http://b/issue?id=2266962
---
 .../src/com/android/demo/notepad3/NoteEdit.java            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java
index 710ea339d..f5eb6c433 100755
--- a/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java
+++ b/tutorials/NotepadCodeLab/Notepadv3Solution/src/com/android/demo/notepad3/NoteEdit.java
@@ -43,8 +43,8 @@ public class NoteEdit extends Activity {
       
         Button confirmButton = (Button) findViewById(R.id.confirm);
        
-        mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) 
-                							: null;
+        mRowId = (savedInstanceState == null) ? null :
+            (Long) savedInstanceState.getSerializable(NotesDbAdapter.KEY_ROWID);
 		if (mRowId == null) {
 			Bundle extras = getIntent().getExtras();            
 			mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) 
@@ -77,7 +77,8 @@ public class NoteEdit extends Activity {
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-        outState.putLong(NotesDbAdapter.KEY_ROWID, mRowId);
+        saveState();
+        outState.putSerializable(NotesDbAdapter.KEY_ROWID, mRowId);
     }
     
     @Override