diff options
author | Dianne Hackborn <hackbod@google.com> | 2013-03-26 17:28:19 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-26 17:28:19 -0700 |
commit | 1a95a42c8984aa9012a9d9ea24fc54a7b09e6148 (patch) | |
tree | 81a0a77e60ebfb420820beff66b350ccf86e622c /core/java/android/appwidget | |
parent | 5ab6d905782562995f1755f03c3716887fba53b8 (diff) | |
parent | 177543db55f88f060d9a43df79afd6733cd565da (diff) | |
download | frameworks_base-1a95a42c8984aa9012a9d9ea24fc54a7b09e6148.zip frameworks_base-1a95a42c8984aa9012a9d9ea24fc54a7b09e6148.tar.gz frameworks_base-1a95a42c8984aa9012a9d9ea24fc54a7b09e6148.tar.bz2 |
am 177543db: am 3bcc2fba: Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev
* commit '177543db55f88f060d9a43df79afd6733cd565da':
Fix issue #8470131: Process thrash kills battery
Diffstat (limited to 'core/java/android/appwidget')
-rw-r--r-- | core/java/android/appwidget/AppWidgetManager.java | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index e68d23a..1166e4b 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -49,8 +49,8 @@ public class AppWidgetManager { static final String TAG = "AppWidgetManager"; /** - * Send this from your {@link AppWidgetHost} activity when you want to pick an AppWidget to display. - * The AppWidget picker activity will be launched. + * Activity action to launch from your {@link AppWidgetHost} activity when you want to + * pick an AppWidget to display. The AppWidget picker activity will be launched. * <p> * You must supply the following extras: * <table> @@ -89,8 +89,8 @@ public class AppWidgetManager { ACTION_KEYGUARD_APPWIDGET_PICK = "android.appwidget.action.KEYGUARD_APPWIDGET_PICK"; /** - * Send this from your {@link AppWidgetHost} activity when you want to bind an AppWidget to - * display and bindAppWidgetIdIfAllowed returns false. + * Activity action to launch from your {@link AppWidgetHost} activity when you want to bind + * an AppWidget to display and bindAppWidgetIdIfAllowed returns false. * <p> * You must supply the following extras: * <table> @@ -269,6 +269,9 @@ public class AppWidgetManager { /** * Sent when the custom extras for an AppWidget change. * + * <p class="note">This is a protected intent that can only be sent + * by the system. + * * @see AppWidgetProvider#onAppWidgetOptionsChanged * AppWidgetProvider.onAppWidgetOptionsChanged(Context context, * AppWidgetManager appWidgetManager, int appWidgetId, Bundle newExtras) @@ -278,6 +281,9 @@ public class AppWidgetManager { /** * Sent when an instance of an AppWidget is deleted from its host. * + * <p class="note">This is a protected intent that can only be sent + * by the system. + * * @see AppWidgetProvider#onDeleted AppWidgetProvider.onDeleted(Context context, int[] appWidgetIds) */ public static final String ACTION_APPWIDGET_DELETED = "android.appwidget.action.APPWIDGET_DELETED"; @@ -285,6 +291,9 @@ public class AppWidgetManager { /** * Sent when an instance of an AppWidget is removed from the last host. * + * <p class="note">This is a protected intent that can only be sent + * by the system. + * * @see AppWidgetProvider#onEnabled AppWidgetProvider.onEnabled(Context context) */ public static final String ACTION_APPWIDGET_DISABLED = "android.appwidget.action.APPWIDGET_DISABLED"; @@ -294,6 +303,9 @@ public class AppWidgetManager { * This broadcast is sent at boot time if there is a AppWidgetHost installed with * an instance for this provider. * + * <p class="note">This is a protected intent that can only be sent + * by the system. + * * @see AppWidgetProvider#onEnabled AppWidgetProvider.onEnabled(Context context) */ public static final String ACTION_APPWIDGET_ENABLED = "android.appwidget.action.APPWIDGET_ENABLED"; |