auto import from //branches/cupcake/...@137873

24 files changed, 321 insertions, 303 deletions

diff --git a/tests/AndroidTests/src/com/android/unit_tests/DatabaseGeneralTest.java b/tests/AndroidTests/src/com/android/unit_tests/DatabaseGeneralTest.java
index b004c93..d775dc2 100644
--- a/tests/AndroidTests/src/com/android/unit_tests/DatabaseGeneralTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/DatabaseGeneralTest.java
@@ -167,15 +167,6 @@ public class DatabaseGeneralTest extends TestCase implements PerformanceTestCase
         c.close();
 
         c = mDatabase.query("phones", null,
-                "PHONE_NUMBERS_EQUAL(num, '+1 (617).555-1212p1234')", null, null, null, null);
-        assertNotNull(c);
-        assertEquals(1, c.getCount());
-        c.moveToFirst();
-        number = c.getString(c.getColumnIndexOrThrow("num"));
-        assertEquals("+" + PHONE_NUMBER, number);
-        c.close();
-
-        c = mDatabase.query("phones", null,
                 "PHONE_NUMBERS_EQUAL(num, '" + PHONE_NUMBER + "')", null, null, null, null);
         assertNotNull(c);
         assertEquals(1, c.getCount());
diff --git a/tests/AndroidTests/src/com/android/unit_tests/DatabaseLocaleTest.java b/tests/AndroidTests/src/com/android/unit_tests/DatabaseLocaleTest.java
index 0560c21..f07ca7c 100644
--- a/tests/AndroidTests/src/com/android/unit_tests/DatabaseLocaleTest.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/DatabaseLocaleTest.java
@@ -46,9 +46,13 @@ public class DatabaseLocaleTest extends TestCase {
     protected void setUp() throws Exception {
         super.setUp();
         mDatabase = SQLiteDatabase.create(null);
-        mDatabase.execSQL("CREATE TABLE test (data TEXT COLLATE LOCALIZED);");
+        mDatabase.execSQL(
+                "CREATE TABLE test (id INTEGER PRIMARY KEY, data TEXT COLLATE LOCALIZED);");
+    }
+
+    private void insertStrings() {
         for (String s : STRINGS) {
-            mDatabase.execSQL("INSERT INTO test VALUES('" + s + "');");
+            mDatabase.execSQL("INSERT INTO test (data) VALUES('" + s + "');");
         }
     }
 
@@ -75,12 +79,14 @@ public class DatabaseLocaleTest extends TestCase {
 
     @MediumTest
     public void testLocaleInsertOrder() throws Exception {
+        insertStrings();
         String[] results = query("SELECT data FROM test");
         MoreAsserts.assertEquals(STRINGS, results);
     }
 
     @MediumTest
     public void testLocaleenUS() throws Exception {
+        insertStrings();
         Log.i("LocaleTest", "about to call setLocale en_US");
         mDatabase.setLocale(new Locale("en", "US"));
         String[] results;
@@ -99,4 +105,25 @@ public class DatabaseLocaleTest extends TestCase {
                 STRINGS[5],  // "dog"
         });
     }
-}
+
+    @SmallTest
+    public void testHoge() throws Exception {
+        Cursor cursor = null;
+        try {
+            String expectedString = new String(new int[] {0xFE000}, 0, 1);
+            mDatabase.execSQL("INSERT INTO test(id, data) VALUES(1, '" + expectedString + "')");
+            cursor = mDatabase.rawQuery("SELECT data FROM test WHERE id = 1", null);
+            
+            assertNotNull(cursor);
+            assertTrue(cursor.moveToFirst());
+            String actualString = cursor.getString(0);
+            assertEquals(expectedString.length(), actualString.length());
+            for (int i = 0; i < expectedString.length(); i++) {
+                assertEquals((int)expectedString.charAt(i), (int)actualString.charAt(i));
+            }
+            assertEquals(expectedString, actualString);
+        } finally {
+            if (cursor != null) cursor.close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/gadgets/GadgetHostTest/Android.mk b/tests/appwidgets/AppWidgetHostTest/Android.mk
index 5e04b81..1bb1e54 100644
--- a/tests/gadgets/GadgetHostTest/Android.mk
+++ b/tests/appwidgets/AppWidgetHostTest/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := user
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
-LOCAL_PACKAGE_NAME := GadgetHostTest
+LOCAL_PACKAGE_NAME := AppWidgetHostTest
 LOCAL_CERTIFICATE := platform
 
 include $(BUILD_PACKAGE)
diff --git a/tests/gadgets/GadgetHostTest/AndroidManifest.xml b/tests/appwidgets/AppWidgetHostTest/AndroidManifest.xml
index 52e314f..bf6a7cb 100644
--- a/tests/gadgets/GadgetHostTest/AndroidManifest.xml
+++ b/tests/appwidgets/AppWidgetHostTest/AndroidManifest.xml
@@ -1,16 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.tests.gadgethost">
+        package="com.android.tests.appwidgethost">
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application>
-        <activity android:name="GadgetHostActivity" android:label="_GadgetHost">
+        <activity android:name="AppWidgetHostActivity" android:label="_AppWidgetHost">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="TestGadgetConfigure" android:label="Configure TestGadgetProvider">
+        <activity android:name="TestAppWidgetConfigure" android:label="Configure TestAppWidgetProvider">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -18,19 +18,19 @@
             </intent-filter>
         </activity>
 
-        <!-- BEGIN_INCLUDE(GadgetProvider) -->
-        <receiver android:name="TestGadgetProvider"
+        <!-- BEGIN_INCLUDE(AppWidgetProvider) -->
+        <receiver android:name="TestAppWidgetProvider"
                     android:label="@string/oh_hai"
                     android:icon="@drawable/oh_hai_icon"
                     >
             <intent-filter>
-                <action android:name="android.gadget.action.GADGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
-            <meta-data android:name="android.gadget.provider"
-                        android:resource="@xml/gadget_info"
+            <meta-data android:name="android.appwidget.provider"
+                        android:resource="@xml/appwidget_info"
                         />
         </receiver>
-        <!-- END_INCLUDE(GadgetProvider) -->
+        <!-- END_INCLUDE(AppWidgetProvider) -->
         
     </application>
 </manifest>
diff --git a/tests/gadgets/GadgetHostTest/res/drawable/oh_hai_icon.png b/tests/appwidgets/AppWidgetHostTest/res/drawable/oh_hai_icon.png
index 30ff267..30ff267 100644
--- a/tests/gadgets/GadgetHostTest/res/drawable/oh_hai_icon.png
+++ b/tests/appwidgets/AppWidgetHostTest/res/drawable/oh_hai_icon.png
diff --git a/tests/gadgets/GadgetHostTest/res/layout/gadget_host.xml b/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml
index 743f6c6..e5c3b28 100644
--- a/tests/gadgets/GadgetHostTest/res/layout/gadget_host.xml
+++ b/tests/appwidgets/AppWidgetHostTest/res/layout/appwidget_host.xml
@@ -22,7 +22,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/gadget_view_title"
+        android:text="@string/appwidget_view_title"
     />
 
     <ScrollView
@@ -31,8 +31,8 @@
         android:layout_weight="1"
         >
         
-        <com.android.tests.gadgethost.GadgetContainerView
-            android:id="@+id/gadget_container"
+        <com.android.tests.appwidgethost.AppWidgetContainerView
+            android:id="@+id/appwidget_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
@@ -41,8 +41,8 @@
     </ScrollView>
 
     <Button
-        android:id="@+id/add_gadget"
-        android:text="@string/add_gadget"
+        android:id="@+id/add_appwidget"
+        android:text="@string/add_appwidget"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         />
diff --git a/tests/gadgets/GadgetHostTest/res/layout/test_gadget.xml b/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget.xml
index 4d483c7..4d483c7 100644
--- a/tests/gadgets/GadgetHostTest/res/layout/test_gadget.xml
+++ b/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget.xml
diff --git a/tests/gadgets/GadgetHostTest/res/layout/test_gadget_configure.xml b/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml
index 0d9b983..0d9b983 100644
--- a/tests/gadgets/GadgetHostTest/res/layout/test_gadget_configure.xml
+++ b/tests/appwidgets/AppWidgetHostTest/res/layout/test_appwidget_configure.xml
diff --git a/tests/gadgets/GadgetHostTest/res/values/strings.xml b/tests/appwidgets/AppWidgetHostTest/res/values/strings.xml
index ad9916a..8a617e7 100644
--- a/tests/gadgets/GadgetHostTest/res/values/strings.xml
+++ b/tests/appwidgets/AppWidgetHostTest/res/values/strings.xml
@@ -15,10 +15,10 @@
 -->
 
 <resources>
-    <string name="gadget_view_title">Gadget Test</string>
-    <string name="add_gadget">Add Gadget</string>
+    <string name="appwidget_view_title">Widget Test</string>
+    <string name="add_appwidget">Add Widget</string>
     <string name="oh_hai">Oh hai.</string>
-    <string name="delete_gadget">Delete</string>
+    <string name="delete_appwidget">Delete</string>
     <string name="save">Save</string>
 </resources>
 
diff --git a/tests/appwidgets/AppWidgetHostTest/res/xml/appwidget_info.xml b/tests/appwidgets/AppWidgetHostTest/res/xml/appwidget_info.xml
new file mode 100644
index 0000000..f12ba16
--- /dev/null
+++ b/tests/appwidgets/AppWidgetHostTest/res/xml/appwidget_info.xml
@@ -0,0 +1,10 @@
+<!-- BEGIN_INCLUDE(AppWidgetProviderInfo) -->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="40dp"
+    android:minHeight="30dp"
+    android:updatePeriodMillis="86400000"
+    android:initialLayout="@layout/test_appwidget"
+    android:configure="com.android.tests.appwidgethost.TestAppWidgetConfigure"
+    >
+</appwidget-provider>
+<!-- END_INCLUDE(AppWidgetProviderInfo) -->
diff --git a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/GadgetContainerView.java b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetContainerView.java
index 3814836..b08ba52 100644
--- a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/GadgetContainerView.java
+++ b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetContainerView.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.tests.gadgethost;
+package com.android.tests.appwidgethost;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 
-public class GadgetContainerView extends LinearLayout
+public class AppWidgetContainerView extends LinearLayout
 {
-    public GadgetContainerView(Context context) {
+    public AppWidgetContainerView(Context context) {
         super(context);
     }
 
-    public GadgetContainerView(Context context, AttributeSet attrs) {
+    public AppWidgetContainerView(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 }
diff --git a/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java
new file mode 100644
index 0000000..2fb2d1d
--- /dev/null
+++ b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/AppWidgetHostActivity.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2008 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.tests.appwidgethost;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.appwidget.AppWidgetHost;
+import android.appwidget.AppWidgetHostView;
+import android.appwidget.AppWidgetProviderInfo;
+import android.appwidget.AppWidgetManager;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.LinearLayout;
+
+public class AppWidgetHostActivity extends Activity
+{
+    static final String TAG = "AppWidgetHostActivity";
+
+    static final int DISCOVER_APPWIDGET_REQUEST = 1;
+    static final int CONFIGURE_APPWIDGET_REQUEST = 2;
+    static final int HOST_ID = 1234;
+
+    static final String PENDING_APPWIDGET_ID = "pending_appwidget";
+    
+    AppWidgetManager mAppWidgetManager;
+    AppWidgetContainerView mAppWidgetContainer;
+
+    public AppWidgetHostActivity() {
+        mAppWidgetManager = AppWidgetManager.getInstance(this);
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setContentView(R.layout.appwidget_host);
+
+        findViewById(R.id.add_appwidget).setOnClickListener(mOnClickListener);
+        mAppWidgetContainer = (AppWidgetContainerView)findViewById(R.id.appwidget_container);
+
+        if (false) {
+            if (false) {
+                mHost.deleteHost();
+            } else {
+                AppWidgetHost.deleteAllHosts();
+            }
+        }
+    }
+
+    View.OnClickListener mOnClickListener = new View.OnClickListener() {
+        public void onClick(View v) {
+            discoverAppWidget(DISCOVER_APPWIDGET_REQUEST);
+        }
+    };
+
+    void discoverAppWidget(int requestCode) {
+        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_PICK);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mHost.allocateAppWidgetId());
+        startActivityForResult(intent, requestCode);
+    }
+
+    void configureAppWidget(int requestCode, int appWidgetId, ComponentName configure) {
+        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_CONFIGURE);
+        intent.setComponent(configure);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+        SharedPreferences.Editor prefs = getPreferences(0).edit();
+        prefs.putInt(PENDING_APPWIDGET_ID, appWidgetId);
+        prefs.commit();
+        startActivityForResult(intent, requestCode);
+    }
+
+    void handleAppWidgetPickResult(int resultCode, Intent intent) {
+        // BEGIN_INCLUDE(getExtra_EXTRA_APPWIDGET_ID)
+        Bundle extras = intent.getExtras();
+        int appWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID);
+        // END_INCLUDE(getExtra_EXTRA_APPWIDGET_ID)
+        if (resultCode == RESULT_OK) {
+            AppWidgetProviderInfo appWidget = mAppWidgetManager.getAppWidgetInfo(appWidgetId);
+
+            if (appWidget.configure != null) {
+                // configure the AppWidget if we should
+                configureAppWidget(CONFIGURE_APPWIDGET_REQUEST, appWidgetId, appWidget.configure);
+            } else {
+                // just add it as is
+                addAppWidgetView(appWidgetId, appWidget);
+            }
+        } else {
+            mHost.deleteAppWidgetId(appWidgetId);
+        }
+    }
+
+    void handleAppWidgetConfigureResult(int resultCode, Intent data) {
+        int appWidgetId = getPreferences(0).getInt(PENDING_APPWIDGET_ID, -1);
+        Log.d(TAG, "resultCode=" + resultCode + " appWidgetId=" + appWidgetId);
+        if (appWidgetId < 0) {
+            Log.w(TAG, "was no preference for PENDING_APPWIDGET_ID");
+            return;
+        }
+        if (resultCode == RESULT_OK) {
+            AppWidgetProviderInfo appWidget = mAppWidgetManager.getAppWidgetInfo(appWidgetId);
+            addAppWidgetView(appWidgetId, appWidget);
+        } else {
+            mHost.deleteAppWidgetId(appWidgetId);
+        }
+    }
+
+    void addAppWidgetView(int appWidgetId, AppWidgetProviderInfo appWidget) {
+        // Inflate the AppWidget's RemoteViews
+        AppWidgetHostView view = mHost.createView(this, appWidgetId, appWidget);
+
+        // Add it to the list
+        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.FILL_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT);
+        mAppWidgetContainer.addView(view, layoutParams);
+
+        registerForContextMenu(view);
+    }
+
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        switch (requestCode) {
+        case DISCOVER_APPWIDGET_REQUEST:
+            handleAppWidgetPickResult(resultCode, data);
+            break;
+        case CONFIGURE_APPWIDGET_REQUEST:
+            handleAppWidgetConfigureResult(resultCode, data);
+        }
+    }
+
+    protected void onStart() {
+        super.onStart();
+        mHost.startListening();
+    }
+
+    protected void onStop() {
+        super.onStop();
+        mHost.stopListening();
+    }
+
+    public void onCreateContextMenu(ContextMenu menu, View v,
+            ContextMenu.ContextMenuInfo menuInfo) {
+        menu.add(ContextMenu.NONE, R.string.delete_appwidget, ContextMenu.NONE,
+                R.string.delete_appwidget);
+    }
+
+    public boolean onContextItemSelected(MenuItem item) {
+        MyAppWidgetView view = (MyAppWidgetView)item.getMenuInfo();
+        switch (item.getItemId()) {
+        case R.string.delete_appwidget:
+            Log.d(TAG, "delete! " + view.appWidgetId);
+            mAppWidgetContainer.removeView(view);
+            mHost.deleteAppWidgetId(view.appWidgetId);
+            break;
+        }
+
+        return true;
+    }
+
+    class MyAppWidgetView extends AppWidgetHostView implements ContextMenu.ContextMenuInfo {
+        int appWidgetId;
+
+        MyAppWidgetView(int appWidgetId) {
+            super(AppWidgetHostActivity.this);
+            this.appWidgetId = appWidgetId;
+        }
+
+        public ContextMenu.ContextMenuInfo getContextMenuInfo() {
+            return this;
+        }
+    }
+
+    AppWidgetHost mHost = new AppWidgetHost(this, HOST_ID) {
+        protected AppWidgetHostView onCreateView(Context context, int appWidgetId, AppWidgetProviderInfo appWidget) {
+            return new MyAppWidgetView(appWidgetId);
+        }
+    };
+}
+
+
diff --git a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/TestGadgetConfigure.java b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/TestAppWidgetConfigure.java
index 897c13c..9a6099a 100644
--- a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/TestGadgetConfigure.java
+++ b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/TestAppWidgetConfigure.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.tests.gadgethost;
+package com.android.tests.appwidgethost;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -24,17 +24,17 @@ import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 
-public class TestGadgetConfigure extends Activity {
-    static final String TAG = "TestGadgetConfigure";
+public class TestAppWidgetConfigure extends Activity {
+    static final String TAG = "TestAppWidgetConfigure";
 
-    public TestGadgetConfigure() {
+    public TestAppWidgetConfigure() {
         super();
     }
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        setContentView(R.layout.test_gadget_configure);
+        setContentView(R.layout.test_appwidget_configure);
 
         findViewById(R.id.save_button).setOnClickListener(mOnClickListener);
     }
@@ -43,9 +43,9 @@ public class TestGadgetConfigure extends Activity {
         public void onClick(View v) {
             String text = ((EditText)findViewById(R.id.edit_text)).getText().toString();
             Log.d(TAG, "text is '" + text + '\'');
-            SharedPreferences.Editor prefs = getSharedPreferences(TestGadgetProvider.PREFS_NAME, 0)
+            SharedPreferences.Editor prefs = getSharedPreferences(TestAppWidgetProvider.PREFS_NAME, 0)
                     .edit();
-            prefs.putString(TestGadgetProvider.PREF_PREFIX_KEY, text);
+            prefs.putString(TestAppWidgetProvider.PREF_PREFIX_KEY, text);
             prefs.commit();
             setResult(RESULT_OK);
             finish();
diff --git a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/TestGadgetProvider.java b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/TestAppWidgetProvider.java
index 370a50b..b5d91d4 100644
--- a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/TestGadgetProvider.java
+++ b/tests/appwidgets/AppWidgetHostTest/src/com/android/tests/appwidgethost/TestAppWidgetProvider.java
@@ -14,54 +14,54 @@
  * limitations under the License.
  */
 
-package com.android.tests.gadgethost;
+package com.android.tests.appwidgethost;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.gadget.GadgetManager;
+import android.appwidget.AppWidgetManager;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.util.Log;
 import android.widget.RemoteViews;
 
-public class TestGadgetProvider extends BroadcastReceiver {
-    static final String TAG = "TestGadgetProvider";
+public class TestAppWidgetProvider extends BroadcastReceiver {
+    static final String TAG = "TestAppWidgetProvider";
 
-    static final String PREFS_NAME = "com.android.tests.gadgethost.TestGadgetProvider";
+    static final String PREFS_NAME = "com.android.tests.appwidgethost.TestAppWidgetProvider";
     static final String PREF_PREFIX_KEY = "prefix";
 
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         Log.d(TAG, "intent=" + intent);
 
-        if (GadgetManager.ACTION_GADGET_ENABLED.equals(action)) {
+        if (AppWidgetManager.ACTION_APPWIDGET_ENABLED.equals(action)) {
             Log.d(TAG, "ENABLED");
         }
-        else if (GadgetManager.ACTION_GADGET_DISABLED.equals(action)) {
+        else if (AppWidgetManager.ACTION_APPWIDGET_DISABLED.equals(action)) {
             Log.d(TAG, "DISABLED");
         }
-        else if (GadgetManager.ACTION_GADGET_UPDATE.equals(action)) {
+        else if (AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action)) {
             Log.d(TAG, "UPDATE");
-            // BEGIN_INCLUDE(getExtra_EXTRA_GADGET_IDS)
+            // BEGIN_INCLUDE(getExtra_EXTRA_APPWIDGET_IDS)
             Bundle extras = intent.getExtras();
-            int[] gadgetIds = extras.getIntArray(GadgetManager.EXTRA_GADGET_IDS);
-            // END_INCLUDE(getExtra_EXTRA_GADGET_IDS)
+            int[] appWidgetIds = extras.getIntArray(AppWidgetManager.EXTRA_APPWIDGET_IDS);
+            // END_INCLUDE(getExtra_EXTRA_APPWIDGET_IDS)
 
             SharedPreferences prefs = context.getSharedPreferences(
-                    TestGadgetProvider.PREFS_NAME, 0);
+                    TestAppWidgetProvider.PREFS_NAME, 0);
             String prefix = prefs.getString(PREF_PREFIX_KEY, "hai");
 
-            GadgetManager gm = GadgetManager.getInstance(context);
-            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.test_gadget);
+            AppWidgetManager gm = AppWidgetManager.getInstance(context);
+            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.test_appwidget);
             views.setTextViewText(R.id.oh_hai_text, prefix + ": " + SystemClock.elapsedRealtime());
             if (false) {
-                gm.updateGadget(gadgetIds, views);
+                gm.updateAppWidget(appWidgetIds, views);
             } else {
-                gm.updateGadget(new ComponentName("com.android.tests.gadgethost",
-                            "com.android.tests.gadgethost.TestGadgetProvider"), views);
+                gm.updateAppWidget(new ComponentName("com.android.tests.appwidgethost",
+                            "com.android.tests.appwidgethost.TestAppWidgetProvider"), views);
             }
         }
     }
diff --git a/tests/gadgets/GadgetProviderTest/Android.mk b/tests/appwidgets/AppWidgetProviderTest/Android.mk
index b9bfcdb..c87a0f2 100644
--- a/tests/gadgets/GadgetProviderTest/Android.mk
+++ b/tests/appwidgets/AppWidgetProviderTest/Android.mk
@@ -5,7 +5,7 @@ LOCAL_MODULE_TAGS := user
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
-LOCAL_PACKAGE_NAME := GadgetProvider
+LOCAL_PACKAGE_NAME := AppWidgetProvider
 LOCAL_CERTIFICATE := platform
 
 include $(BUILD_PACKAGE)
diff --git a/tests/appwidgets/AppWidgetProviderTest/AndroidManifest.xml b/tests/appwidgets/AppWidgetProviderTest/AndroidManifest.xml
new file mode 100644
index 0000000..ec4d583
--- /dev/null
+++ b/tests/appwidgets/AppWidgetProviderTest/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.android.tests.appwidgetprovider">
+    <uses-permission android:name="android.permission.VIBRATE" />
+
+    <application>
+        <receiver android:name="TestAppWidgetProvider">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
+        </receiver>
+    </application>
+</manifest>
diff --git a/tests/gadgets/GadgetProviderTest/res/layout/test_gadget.xml b/tests/appwidgets/AppWidgetProviderTest/res/layout/test_appwidget.xml
index e0a416e..e0a416e 100644
--- a/tests/gadgets/GadgetProviderTest/res/layout/test_gadget.xml
+++ b/tests/appwidgets/AppWidgetProviderTest/res/layout/test_appwidget.xml
diff --git a/tests/gadgets/GadgetProviderTest/res/values/strings.xml b/tests/appwidgets/AppWidgetProviderTest/res/values/strings.xml
index e07725f..e51299b 100644
--- a/tests/gadgets/GadgetProviderTest/res/values/strings.xml
+++ b/tests/appwidgets/AppWidgetProviderTest/res/values/strings.xml
@@ -15,9 +15,9 @@
 -->
 
 <resources>
-    <string name="gadget_view_title">Gadget Test</string>
-    <string name="add_gadget">Add Gadget</string>
+    <string name="appwidget_view_title">Widget Test</string>
+    <string name="add_appwidget">Add Widget</string>
     <string name="oh_hai">Oh hai.</string>
-    <string name="delete_gadget">Delete</string>
+    <string name="delete_appwidget">Delete</string>
 </resources>
 
diff --git a/tests/appwidgets/AppWidgetProviderTest/res/xml/appwidget_info.xml b/tests/appwidgets/AppWidgetProviderTest/res/xml/appwidget_info.xml
new file mode 100644
index 0000000..c133743
--- /dev/null
+++ b/tests/appwidgets/AppWidgetProviderTest/res/xml/appwidget_info.xml
@@ -0,0 +1,7 @@
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:minWidth="150dp"
+    android:minHeight="150dp"
+    android:updatePeriodMillis="2000"
+    android:initialLayout="@layout/test_appwidget"
+    >
+</appwidget-provider>
diff --git a/tests/gadgets/GadgetProviderTest/src/com/android/tests/gadgetprovider/TestGadgetProvider.java b/tests/appwidgets/AppWidgetProviderTest/src/com/android/tests/appwidgetprovider/TestAppWidgetProvider.java
index b81575f..418be65 100644
--- a/tests/gadgets/GadgetProviderTest/src/com/android/tests/gadgetprovider/TestGadgetProvider.java
+++ b/tests/appwidgets/AppWidgetProviderTest/src/com/android/tests/appwidgetprovider/TestAppWidgetProvider.java
@@ -14,45 +14,45 @@
  * limitations under the License.
  */
 
-package com.android.tests.gadgetprovider;
+package com.android.tests.appwidgetprovider;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.gadget.GadgetManager;
+import android.appwidget.AppWidgetManager;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.util.Log;
 import android.widget.RemoteViews;
 
-public class TestGadgetProvider extends BroadcastReceiver {
+public class TestAppWidgetProvider extends BroadcastReceiver {
 
-    static final String TAG = "TestGadgetProvider";
+    static final String TAG = "TestAppWidgetProvider";
 
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         Log.d(TAG, "intent=" + intent);
 
-        if (GadgetManager.ACTION_GADGET_ENABLED.equals(action)) {
+        if (AppWidgetManager.ACTION_APPWIDGET_ENABLED.equals(action)) {
             Log.d(TAG, "ENABLED");
         }
-        else if (GadgetManager.ACTION_GADGET_DISABLED.equals(action)) {
+        else if (AppWidgetManager.ACTION_APPWIDGET_DISABLED.equals(action)) {
             Log.d(TAG, "DISABLED");
         }
-        else if (GadgetManager.ACTION_GADGET_UPDATE.equals(action)) {
+        else if (AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action)) {
             Log.d(TAG, "UPDATE");
             Bundle extras = intent.getExtras();
-            int[] gadgetIds = extras.getIntArray(GadgetManager.EXTRA_GADGET_IDS);
+            int[] appWidgetIds = extras.getIntArray(AppWidgetManager.EXTRA_APPWIDGET_IDS);
 
-            GadgetManager gm = GadgetManager.getInstance(context);
-            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.test_gadget);
+            AppWidgetManager gm = AppWidgetManager.getInstance(context);
+            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.test_appwidget);
             views.setTextViewText(R.id.oh_hai_text, "hai: " + SystemClock.elapsedRealtime());
             if (false) {
-                gm.updateGadget(gadgetIds, views);
+                gm.updateAppWidget(appWidgetIds, views);
             } else {
-                gm.updateGadget(new ComponentName("com.android.tests.gadgetprovider",
-                            "com.android.tests.gadgetprovider.TestGadgetProvider"), views);
+                gm.updateAppWidget(new ComponentName("com.android.tests.appwidgetprovider",
+                            "com.android.tests.appwidgetprovider.TestAppWidgetProvider"), views);
             }
         }
     }
diff --git a/tests/gadgets/GadgetHostTest/res/xml/gadget_info.xml b/tests/gadgets/GadgetHostTest/res/xml/gadget_info.xml
deleted file mode 100644
index e0c4222..0000000
--- a/tests/gadgets/GadgetHostTest/res/xml/gadget_info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- BEGIN_INCLUDE(GadgetProviderInfo) -->
-<gadget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="40dp"
-    android:minHeight="30dp"
-    android:updatePeriodMillis="86400000"
-    android:initialLayout="@layout/test_gadget"
-    android:configure="com.android.tests.gadgethost.TestGadgetConfigure"
-    >
-</gadget-provider>
-<!-- END_INCLUDE(GadgetProviderInfo) -->
diff --git a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/GadgetHostActivity.java b/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/GadgetHostActivity.java
deleted file mode 100644
index 0bd8926..0000000
--- a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/GadgetHostActivity.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2008 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.tests.gadgethost;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.gadget.GadgetHost;
-import android.gadget.GadgetHostView;
-import android.gadget.GadgetProviderInfo;
-import android.gadget.GadgetManager;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.LinearLayout;
-
-public class GadgetHostActivity extends Activity
-{
-    static final String TAG = "GadgetHostActivity";
-
-    static final int DISCOVER_GADGET_REQUEST = 1;
-    static final int CONFIGURE_GADGET_REQUEST = 2;
-    static final int HOST_ID = 1234;
-
-    static final String PENDING_GADGET_ID = "pending_gadget";
-    
-    GadgetManager mGadgetManager;
-    GadgetContainerView mGadgetContainer;
-
-    public GadgetHostActivity() {
-        mGadgetManager = GadgetManager.getInstance(this);
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.gadget_host);
-
-        findViewById(R.id.add_gadget).setOnClickListener(mOnClickListener);
-        mGadgetContainer = (GadgetContainerView)findViewById(R.id.gadget_container);
-
-        if (false) {
-            if (false) {
-                mHost.deleteHost();
-            } else {
-                GadgetHost.deleteAllHosts();
-            }
-        }
-    }
-
-    View.OnClickListener mOnClickListener = new View.OnClickListener() {
-        public void onClick(View v) {
-            discoverGadget(DISCOVER_GADGET_REQUEST);
-        }
-    };
-
-    void discoverGadget(int requestCode) {
-        Intent intent = new Intent(GadgetManager.ACTION_GADGET_PICK);
-        intent.putExtra(GadgetManager.EXTRA_GADGET_ID, mHost.allocateGadgetId());
-        startActivityForResult(intent, requestCode);
-    }
-
-    void configureGadget(int requestCode, int gadgetId, ComponentName configure) {
-        Intent intent = new Intent(GadgetManager.ACTION_GADGET_CONFIGURE);
-        intent.setComponent(configure);
-        intent.putExtra(GadgetManager.EXTRA_GADGET_ID, gadgetId);
-        SharedPreferences.Editor prefs = getPreferences(0).edit();
-        prefs.putInt(PENDING_GADGET_ID, gadgetId);
-        prefs.commit();
-        startActivityForResult(intent, requestCode);
-    }
-
-    void handleGadgetPickResult(int resultCode, Intent intent) {
-        // BEGIN_INCLUDE(getExtra_EXTRA_GADGET_ID)
-        Bundle extras = intent.getExtras();
-        int gadgetId = extras.getInt(GadgetManager.EXTRA_GADGET_ID);
-        // END_INCLUDE(getExtra_EXTRA_GADGET_ID)
-        if (resultCode == RESULT_OK) {
-            GadgetProviderInfo gadget = mGadgetManager.getGadgetInfo(gadgetId);
-
-            if (gadget.configure != null) {
-                // configure the gadget if we should
-                configureGadget(CONFIGURE_GADGET_REQUEST, gadgetId, gadget.configure);
-            } else {
-                // just add it as is
-                addGadgetView(gadgetId, gadget);
-            }
-        } else {
-            mHost.deleteGadgetId(gadgetId);
-        }
-    }
-
-    void handleGadgetConfigureResult(int resultCode, Intent data) {
-        int gadgetId = getPreferences(0).getInt(PENDING_GADGET_ID, -1);
-        Log.d(TAG, "resultCode=" + resultCode + " gadgetId=" + gadgetId);
-        if (gadgetId < 0) {
-            Log.w(TAG, "was no preference for PENDING_GADGET_ID");
-            return;
-        }
-        if (resultCode == RESULT_OK) {
-            GadgetProviderInfo gadget = mGadgetManager.getGadgetInfo(gadgetId);
-            addGadgetView(gadgetId, gadget);
-        } else {
-            mHost.deleteGadgetId(gadgetId);
-        }
-    }
-
-    void addGadgetView(int gadgetId, GadgetProviderInfo gadget) {
-        // Inflate the gadget's RemoteViews
-        GadgetHostView view = mHost.createView(this, gadgetId, gadget);
-
-        // Add it to the list
-        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.FILL_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT);
-        mGadgetContainer.addView(view, layoutParams);
-
-        registerForContextMenu(view);
-    }
-
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        switch (requestCode) {
-        case DISCOVER_GADGET_REQUEST:
-            handleGadgetPickResult(resultCode, data);
-            break;
-        case CONFIGURE_GADGET_REQUEST:
-            handleGadgetConfigureResult(resultCode, data);
-        }
-    }
-
-    protected void onStart() {
-        super.onStart();
-        mHost.startListening();
-    }
-
-    protected void onStop() {
-        super.onStop();
-        mHost.stopListening();
-    }
-
-    public void onCreateContextMenu(ContextMenu menu, View v,
-            ContextMenu.ContextMenuInfo menuInfo) {
-        menu.add(ContextMenu.NONE, R.string.delete_gadget, ContextMenu.NONE,
-                R.string.delete_gadget);
-    }
-
-    public boolean onContextItemSelected(MenuItem item) {
-        MyGadgetView view = (MyGadgetView)item.getMenuInfo();
-        switch (item.getItemId()) {
-        case R.string.delete_gadget:
-            Log.d(TAG, "delete! " + view.gadgetId);
-            mGadgetContainer.removeView(view);
-            mHost.deleteGadgetId(view.gadgetId);
-            break;
-        }
-
-        return true;
-    }
-
-    class MyGadgetView extends GadgetHostView implements ContextMenu.ContextMenuInfo {
-        int gadgetId;
-
-        MyGadgetView(int gadgetId) {
-            super(GadgetHostActivity.this);
-            this.gadgetId = gadgetId;
-        }
-
-        public ContextMenu.ContextMenuInfo getContextMenuInfo() {
-            return this;
-        }
-    }
-
-    GadgetHost mHost = new GadgetHost(this, HOST_ID) {
-        protected GadgetHostView onCreateView(Context context, int gadgetId, GadgetProviderInfo gadget) {
-            return new MyGadgetView(gadgetId);
-        }
-    };
-}
-
-
diff --git a/tests/gadgets/GadgetProviderTest/AndroidManifest.xml b/tests/gadgets/GadgetProviderTest/AndroidManifest.xml
deleted file mode 100644
index 47a7a2e..0000000
--- a/tests/gadgets/GadgetProviderTest/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="com.android.tests.gadgetprovider">
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <application>
-        <receiver android:name="TestGadgetProvider">
-            <intent-filter>
-                <action android:name="android.gadget.action.GADGET_UPDATE" />
-            </intent-filter>
-            <meta-data android:name="android.gadget.provider" android:resource="@xml/gadget_info" />
-        </receiver>
-    </application>
-</manifest>
diff --git a/tests/gadgets/GadgetProviderTest/res/xml/gadget_info.xml b/tests/gadgets/GadgetProviderTest/res/xml/gadget_info.xml
deleted file mode 100644
index 33cc2e3..0000000
--- a/tests/gadgets/GadgetProviderTest/res/xml/gadget_info.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<gadget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:minWidth="150dp"
-    android:minHeight="150dp"
-    android:updatePeriodMillis="2000"
-    android:initialLayout="@layout/test_gadget"
-    >
-</gadget-provider>