Merge "Suppress unnecessary calls to update widget size (issue 7287744)" into jb-mr1-dev (5745a676) · Commits · e / os / android_frameworks_base

core/java/android/appwidget/AppWidgetHostView.java

+29 −10

Original line number	Original line	Diff line number	Diff line
	@@ -161,7 +161,7 @@ public class AppWidgetHostView extends FrameLayout {
	* @param component the component name of the widget		* @param component the component name of the widget
	* @param padding Rect in which to place the output, if null, a new Rect will be allocated and		* @param padding Rect in which to place the output, if null, a new Rect will be allocated and
	* returned		* returned
	* @return default padding for this widget		* @return default padding for this widget, in pixels
	*/		*/
	public static Rect getDefaultPaddingForWidget(Context context, ComponentName component,		public static Rect getDefaultPaddingForWidget(Context context, ComponentName component,
	Rect padding) {		Rect padding) {
	@@ -241,7 +241,7 @@ public class AppWidgetHostView extends FrameLayout {
	* AppWidget options and causes a callback to the AppWidgetProvider.		* AppWidget options and causes a callback to the AppWidgetProvider.
	* @see AppWidgetProvider#onAppWidgetOptionsChanged(Context, AppWidgetManager, int, Bundle)		* @see AppWidgetProvider#onAppWidgetOptionsChanged(Context, AppWidgetManager, int, Bundle)
	*		*
	* @param options The bundle of options, in addition to the size information,		* @param newOptions The bundle of options, in addition to the size information,
	* can be null.		* can be null.
	* @param minWidth The minimum width that the widget will be displayed at.		* @param minWidth The minimum width that the widget will be displayed at.
	* @param minHeight The maximum height that the widget will be displayed at.		* @param minHeight The maximum height that the widget will be displayed at.
	@@ -249,10 +249,10 @@ public class AppWidgetHostView extends FrameLayout {
	* @param maxHeight The maximum height that the widget will be displayed at.		* @param maxHeight The maximum height that the widget will be displayed at.
	*		*
	*/		*/
	public void updateAppWidgetSize(Bundle options, int minWidth, int minHeight, int maxWidth,		public void updateAppWidgetSize(Bundle newOptions, int minWidth, int minHeight, int maxWidth,
	int maxHeight) {		int maxHeight) {
	if (options == null) {		if (newOptions == null) {
	options = new Bundle();		newOptions = new Bundle();
	}		}

	Rect padding = new Rect();		Rect padding = new Rect();
	@@ -264,11 +264,30 @@ public class AppWidgetHostView extends FrameLayout {
	int xPaddingDips = (int) ((padding.left + padding.right) / density);		int xPaddingDips = (int) ((padding.left + padding.right) / density);
	int yPaddingDips = (int) ((padding.top + padding.bottom) / density);		int yPaddingDips = (int) ((padding.top + padding.bottom) / density);

	options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, minWidth - xPaddingDips);		int newMinWidth = minWidth - xPaddingDips;
	options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, minHeight - yPaddingDips);		int newMinHeight = minHeight - yPaddingDips;
	options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, maxWidth - xPaddingDips);		int newMaxWidth = maxWidth - xPaddingDips;
	options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, maxHeight - yPaddingDips);		int newMaxHeight = maxHeight - yPaddingDips;
	updateAppWidgetOptions(options);
			AppWidgetManager widgetManager = AppWidgetManager.getInstance(mContext);

			// We get the old options to see if the sizes have changed
			Bundle oldOptions = widgetManager.getAppWidgetOptions(mAppWidgetId);
			boolean needsUpdate = false;
			if (newMinWidth != oldOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH) \|\|
			newMinHeight != oldOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT) \|\|
			newMaxWidth != oldOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH) \|\|
			newMaxHeight != oldOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT)) {
			needsUpdate = true;
			}

			if (needsUpdate) {
			newOptions.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, newMinWidth);
			newOptions.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, newMinHeight);
			newOptions.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, newMaxWidth);
			newOptions.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, newMaxHeight);
			updateAppWidgetOptions(newOptions);
			}
	}		}

	/**		/**