Merge "Update javadocs for the AppWidget" (26f8aeb8) · Commits · e / os / android_frameworks_base

core/java/android/appwidget/AppWidgetManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -586,6 +586,9 @@ public class AppWidgetManager {
		* The extras can be used to embed additional information about this widget to be accessed
		* by the associated widget's AppWidgetProvider.
		*
		* <p>
		* The new options are merged into existing options using {@link Bundle#putAll} semantics.
		*
		* @see #getAppWidgetOptions(int)
		*
		* @param appWidgetId The AppWidget instances for which to set the RemoteViews.

+3 −2

Original line number	Diff line number	Diff line
		@@ -127,7 +127,8 @@ public class AppWidgetProvider extends BroadcastReceiver {

		/**
		* Called in response to the {@link AppWidgetManager#ACTION_APPWIDGET_OPTIONS_CHANGED}
		* broadcast when this widget has been layed out at a new size.
		* broadcast when this widget has been layed out at a new size or its options changed via
		* {@link AppWidgetManager#updateAppWidgetOptions}.
		*
		* {@more}
		*
		@@ -136,7 +137,7 @@ public class AppWidgetProvider extends BroadcastReceiver {
		* @param appWidgetManager A {@link AppWidgetManager} object you can call {@link
		* AppWidgetManager#updateAppWidget} on.
		* @param appWidgetId The appWidgetId of the widget whose size changed.
		* @param newOptions The appWidgetId of the widget whose size changed.
		* @param newOptions The new options of the changed widget.
		*
		* @see AppWidgetManager#ACTION_APPWIDGET_OPTIONS_CHANGED
		*/