diff options
Diffstat (limited to 'tests/gadgets')
6 files changed, 34 insertions, 22 deletions
diff --git a/tests/gadgets/GadgetHostTest/AndroidManifest.xml b/tests/gadgets/GadgetHostTest/AndroidManifest.xml index cac2776..52e314f 100644 --- a/tests/gadgets/GadgetHostTest/AndroidManifest.xml +++ b/tests/gadgets/GadgetHostTest/AndroidManifest.xml @@ -17,12 +17,20 @@ <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <receiver android:name="TestGadgetProvider" android:label="@string/oh_hai" - android:icon="@drawable/oh_hai_icon"> + + <!-- BEGIN_INCLUDE(GadgetProvider) --> + <receiver android:name="TestGadgetProvider" + android:label="@string/oh_hai" + android:icon="@drawable/oh_hai_icon" + > <intent-filter> <action android:name="android.gadget.action.GADGET_UPDATE" /> </intent-filter> - <meta-data android:name="android.gadget.provider" android:resource="@xml/gadget_info" /> + <meta-data android:name="android.gadget.provider" + android:resource="@xml/gadget_info" + /> </receiver> + <!-- END_INCLUDE(GadgetProvider) --> + </application> </manifest> diff --git a/tests/gadgets/GadgetHostTest/res/xml/gadget_info.xml b/tests/gadgets/GadgetHostTest/res/xml/gadget_info.xml index 353df30..e0c4222 100644 --- a/tests/gadgets/GadgetHostTest/res/xml/gadget_info.xml +++ b/tests/gadgets/GadgetHostTest/res/xml/gadget_info.xml @@ -1,8 +1,10 @@ +<!-- BEGIN_INCLUDE(GadgetProviderInfo) --> <gadget-provider xmlns:android="http://schemas.android.com/apk/res/android" android:minWidth="40dp" android:minHeight="30dp" - android:updatePeriodMillis="3000" + 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 index d3dcf41..0bd8926 100644 --- a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/GadgetHostActivity.java +++ b/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/GadgetHostActivity.java @@ -23,7 +23,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.gadget.GadgetHost; import android.gadget.GadgetHostView; -import android.gadget.GadgetInfo; +import android.gadget.GadgetProviderInfo; import android.gadget.GadgetManager; import android.os.Bundle; import android.util.Log; @@ -73,14 +73,13 @@ public class GadgetHostActivity extends Activity }; void discoverGadget(int requestCode) { - Intent intent = new Intent(GadgetManager.GADGET_PICK_ACTION); - intent.putExtra(GadgetManager.EXTRA_HOST_ID, HOST_ID); + 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.GADGET_CONFIGURE_ACTION); + Intent intent = new Intent(GadgetManager.ACTION_GADGET_CONFIGURE); intent.setComponent(configure); intent.putExtra(GadgetManager.EXTRA_GADGET_ID, gadgetId); SharedPreferences.Editor prefs = getPreferences(0).edit(); @@ -89,11 +88,13 @@ public class GadgetHostActivity extends Activity startActivityForResult(intent, requestCode); } - void handleGadgetPickResult(int resultCode, Intent data) { - Bundle extras = data.getExtras(); + 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) { - GadgetInfo gadget = mGadgetManager.getGadgetInfo(gadgetId); + GadgetProviderInfo gadget = mGadgetManager.getGadgetInfo(gadgetId); if (gadget.configure != null) { // configure the gadget if we should @@ -115,14 +116,14 @@ public class GadgetHostActivity extends Activity return; } if (resultCode == RESULT_OK) { - GadgetInfo gadget = mGadgetManager.getGadgetInfo(gadgetId); + GadgetProviderInfo gadget = mGadgetManager.getGadgetInfo(gadgetId); addGadgetView(gadgetId, gadget); } else { mHost.deleteGadgetId(gadgetId); } } - void addGadgetView(int gadgetId, GadgetInfo gadget) { + void addGadgetView(int gadgetId, GadgetProviderInfo gadget) { // Inflate the gadget's RemoteViews GadgetHostView view = mHost.createView(this, gadgetId, gadget); @@ -188,11 +189,10 @@ public class GadgetHostActivity extends Activity } GadgetHost mHost = new GadgetHost(this, HOST_ID) { - protected GadgetHostView onCreateView(Context context, int gadgetId, GadgetInfo gadget) { + protected GadgetHostView onCreateView(Context context, int gadgetId, GadgetProviderInfo gadget) { return new MyGadgetView(gadgetId); } }; - } diff --git a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/TestGadgetProvider.java b/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/TestGadgetProvider.java index 7614c9e..370a50b 100644 --- a/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/TestGadgetProvider.java +++ b/tests/gadgets/GadgetHostTest/src/com/android/tests/gadgethost/TestGadgetProvider.java @@ -37,16 +37,18 @@ public class TestGadgetProvider extends BroadcastReceiver { String action = intent.getAction(); Log.d(TAG, "intent=" + intent); - if (GadgetManager.GADGET_ENABLED_ACTION.equals(action)) { + if (GadgetManager.ACTION_GADGET_ENABLED.equals(action)) { Log.d(TAG, "ENABLED"); } - else if (GadgetManager.GADGET_DISABLED_ACTION.equals(action)) { + else if (GadgetManager.ACTION_GADGET_DISABLED.equals(action)) { Log.d(TAG, "DISABLED"); } - else if (GadgetManager.GADGET_UPDATE_ACTION.equals(action)) { + else if (GadgetManager.ACTION_GADGET_UPDATE.equals(action)) { Log.d(TAG, "UPDATE"); + // BEGIN_INCLUDE(getExtra_EXTRA_GADGET_IDS) Bundle extras = intent.getExtras(); int[] gadgetIds = extras.getIntArray(GadgetManager.EXTRA_GADGET_IDS); + // END_INCLUDE(getExtra_EXTRA_GADGET_IDS) SharedPreferences prefs = context.getSharedPreferences( TestGadgetProvider.PREFS_NAME, 0); diff --git a/tests/gadgets/GadgetProviderTest/res/xml/gadget_info.xml b/tests/gadgets/GadgetProviderTest/res/xml/gadget_info.xml index 0b8ca2e..0fc7812 100644 --- a/tests/gadgets/GadgetProviderTest/res/xml/gadget_info.xml +++ b/tests/gadgets/GadgetProviderTest/res/xml/gadget_info.xml @@ -1,7 +1,7 @@ <gadget-provider xmlns:android="http://schemas.android.com/apk/res/android" android:minWidth="40dp" android:minHeight="30dp" - android:updatePeriodMillis="3000" + android:updatePeriodMillis="60000" android:initialLayout="@layout/test_gadget" > </gadget-provider> diff --git a/tests/gadgets/GadgetProviderTest/src/com/android/tests/gadgetprovider/TestGadgetProvider.java b/tests/gadgets/GadgetProviderTest/src/com/android/tests/gadgetprovider/TestGadgetProvider.java index 8622bc7..b81575f 100644 --- a/tests/gadgets/GadgetProviderTest/src/com/android/tests/gadgetprovider/TestGadgetProvider.java +++ b/tests/gadgets/GadgetProviderTest/src/com/android/tests/gadgetprovider/TestGadgetProvider.java @@ -34,13 +34,13 @@ public class TestGadgetProvider extends BroadcastReceiver { String action = intent.getAction(); Log.d(TAG, "intent=" + intent); - if (GadgetManager.GADGET_ENABLED_ACTION.equals(action)) { + if (GadgetManager.ACTION_GADGET_ENABLED.equals(action)) { Log.d(TAG, "ENABLED"); } - else if (GadgetManager.GADGET_DISABLED_ACTION.equals(action)) { + else if (GadgetManager.ACTION_GADGET_DISABLED.equals(action)) { Log.d(TAG, "DISABLED"); } - else if (GadgetManager.GADGET_UPDATE_ACTION.equals(action)) { + else if (GadgetManager.ACTION_GADGET_UPDATE.equals(action)) { Log.d(TAG, "UPDATE"); Bundle extras = intent.getExtras(); int[] gadgetIds = extras.getIntArray(GadgetManager.EXTRA_GADGET_IDS); |