drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8a7eff18: Merge "Account for auto-padding in AppWidgetHostView#updateAppWidgetSize (issue 6454251)" into jb-dev

Browse Source 
* commit '8a7eff18f3f83e0d41de47b84052723f337bf53b':
  Account for auto-padding in AppWidgetHostView#updateAppWidgetSize (issue 6454251)
This commit is contained in:
Adam Cohen
2012-05-09 01:48:50 -07:00
committed by Android Git Automerger
parent eb0890da4c 8a7eff18f3
commit d6e752831c
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/appwidget/AppWidgetHostView.java
View File

@ -208,8 +208,10 @@ public class AppWidgetHostView extends FrameLayout {
}
/**
* Provide guidance about the size of this widget to the AppWidgetManager. This information
* gets embedded into the AppWidgetExtras and causes a callback to the AppWidgetProvider.
* Provide guidance about the size of this widget to the AppWidgetManager. The widths and
* heights should correspond to the full area the AppWidgetHostView is given. Padding added by
* the framework will be accounted for automatically. This information gets embedded into the
* AppWidget options and causes a callback to the AppWidgetProvider.
* @see AppWidgetProvider#onAppWidgetOptionsChanged(Context, AppWidgetManager, int, Bundle)
*
* @param options The bundle of options, in addition to the size information,
@ -225,10 +227,19 @@ public class AppWidgetHostView extends FrameLayout {
if (options == null) {
options = new Bundle();
}
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, minWidth);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, minHeight);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, maxWidth);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, maxHeight);
Rect padding = new Rect();
if (mInfo != null) {
padding = getDefaultPaddingForWidget(mContext, mInfo.provider, padding);
}
int xPadding = padding.left + padding.right;
int yPadding = padding.top + padding.bottom;
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, minWidth - xPadding);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, minHeight - yPadding);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, maxWidth - xPadding);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, maxHeight - yPadding);
updateAppWidgetOptions(options);
}