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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index efcc882..81a6c78 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -45,11 +45,11 @@
             </intent-filter>
         </receiver>
 
             </intent-filter>
         </receiver>
 

-        <receiver android:name="AnalogGadgetProvider" android:label="@string/analog_gadget">
+        <receiver android:name="AnalogAppWidgetProvider" android:label="@string/analog_gadget">

             <intent-filter>
             <intent-filter>

-                <action android:name="android.gadget.action.GADGET_UPDATE" />
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

             </intent-filter>
             </intent-filter>

-            <meta-data android:name="android.gadget.provider" android:resource="@xml/analog_gadget" />
+            <meta-data android:name="android.appwidget.provider" android:resource="@xml/analog_appwidget" />

         </receiver>
     </application>
 </manifest>
         </receiver>
     </application>
 </manifest>

diff --git a/res/drawable/gadget_clock_dial.png b/res/drawable/appwidget_clock_dial.png
similarity index 100%
rename from res/drawable/gadget_clock_dial.png
rename to res/drawable/appwidget_clock_dial.png

diff --git a/res/drawable/gadget_clock_hour.png b/res/drawable/appwidget_clock_hour.png
similarity index 100%
rename from res/drawable/gadget_clock_hour.png
rename to res/drawable/appwidget_clock_hour.png

diff --git a/res/drawable/gadget_clock_minute.png b/res/drawable/appwidget_clock_minute.png
similarity index 100%
rename from res/drawable/gadget_clock_minute.png
rename to res/drawable/appwidget_clock_minute.png

diff --git a/res/layout/analog_gadget.xml b/res/layout/analog_appwidget.xml
similarity index 83%
rename from res/layout/analog_gadget.xml
rename to res/layout/analog_appwidget.xml
index efa4789..7a32477 100644 (file)
--- a/res/layout/analog_gadget.xml
+++ b/res/layout/analog_appwidget.xml
@@ -15,8 +15,8 @@
 -->
 
 <AnalogClock xmlns:android="http://schemas.android.com/apk/res/android"
 -->
 
 <AnalogClock xmlns:android="http://schemas.android.com/apk/res/android"

-    android:dial="@drawable/gadget_clock_dial"
-    android:hand_hour="@drawable/gadget_clock_hour"
-    android:hand_minute="@drawable/gadget_clock_minute"
+    android:dial="@drawable/appwidget_clock_dial"
+    android:hand_hour="@drawable/appwidget_clock_hour"
+    android:hand_minute="@drawable/appwidget_clock_minute"

     android:layout_width="fill_parent"
     android:layout_height="fill_parent" />
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" />

diff --git a/res/xml/analog_gadget.xml b/res/xml/analog_appwidget.xml
similarity index 83%
rename from res/xml/analog_gadget.xml
rename to res/xml/analog_appwidget.xml
index 72724ec..d87b484 100644 (file)
--- a/res/xml/analog_gadget.xml
+++ b/res/xml/analog_appwidget.xml
@@ -14,10 +14,10 @@
      limitations under the License.
 -->
 
      limitations under the License.
 -->
 

-<gadget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"

     android:minWidth="146dip"
     android:minHeight="146dip"
     android:updatePeriodMillis="0"
     android:minWidth="146dip"
     android:minHeight="146dip"
     android:updatePeriodMillis="0"

-    android:initialLayout="@layout/analog_gadget"
+    android:initialLayout="@layout/analog_appwidget"

     >
     >

-</gadget-provider>
+</appwidget-provider>

diff --git a/src/com/android/alarmclock/AnalogGadgetProvider.java b/src/com/android/alarmclock/AnalogAppWidgetProvider.java
similarity index 76%
rename from src/com/android/alarmclock/AnalogGadgetProvider.java
rename to src/com/android/alarmclock/AnalogAppWidgetProvider.java
index 1143da5..524b1d2 100644 (file)
--- a/src/com/android/alarmclock/AnalogGadgetProvider.java
+++ b/src/com/android/alarmclock/AnalogAppWidgetProvider.java
@@ -18,6 +18,7 @@ package com.android.alarmclock;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;

+import android.appwidget.AppWidgetManager;

 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;


@@ -25,7 +26,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.database.Cursor;

-import android.gadget.GadgetManager;

 import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.provider.Calendar;
 import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.provider.Calendar;


@@ -44,22 +44,22 @@ import android.widget.RemoteViews;
 import java.util.Arrays;
 
 /**
 import java.util.Arrays;
 
 /**

- * Simple gadget to show analog clock.
+ * Simple widget to show analog clock.

  */
  */

-public class AnalogGadgetProvider extends BroadcastReceiver {
-    static final String TAG = "AnalogGadgetProvider";
+public class AnalogAppWidgetProvider extends BroadcastReceiver {
+    static final String TAG = "AnalogAppWidgetProvider";

 
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         
 
     public void onReceive(Context context, Intent intent) {
         String action = intent.getAction();
         

-        if (GadgetManager.ACTION_GADGET_UPDATE.equals(action)) {
+        if (AppWidgetManager.ACTION_APPWIDGET_UPDATE.equals(action)) {

             RemoteViews views = new RemoteViews(context.getPackageName(),
             RemoteViews views = new RemoteViews(context.getPackageName(),

-                    R.layout.analog_gadget);
+                    R.layout.analog_appwidget);

             
             

-            int[] gadgetIds = intent.getIntArrayExtra(GadgetManager.EXTRA_GADGET_IDS);
+            int[] appWidgetIds = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);

             
             

-            GadgetManager gm = GadgetManager.getInstance(context);
-            gm.updateGadget(gadgetIds, views);
+            AppWidgetManager gm = AppWidgetManager.getInstance(context);
+            gm.updateAppWidget(appWidgetIds, views);

         }
     }
 }
         }
     }
 }