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

Merge "Accounting for widget padding in dips instead of pixels" into jb-dev

Browse Source
This commit is contained in:
Adam Cohen
2012-05-09 11:23:12 -07:00
committed by Android (Google) Code Review
parent 393295fabf f065c96631
commit 6a080bff83
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,14 +232,15 @@ public class AppWidgetHostView extends FrameLayout {
if (mInfo != null) { if (mInfo != null) {
padding = getDefaultPaddingForWidget(mContext, mInfo.provider, padding); padding = getDefaultPaddingForWidget(mContext, mInfo.provider, padding);
} }
float density = getResources().getDisplayMetrics().density;
int xPadding = padding.left + padding.right; int xPaddingDips = (int) ((padding.left + padding.right) / density);
int yPadding = padding.top + padding.bottom; int yPaddingDips = (int) ((padding.top + padding.bottom) / density);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, minWidth - xPadding); options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH, minWidth - xPaddingDips);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, minHeight - yPadding); options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, minHeight - yPaddingDips);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, maxWidth - xPadding); options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, maxWidth - xPaddingDips);
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, maxHeight - yPadding); options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, maxHeight - yPaddingDips);
updateAppWidgetOptions(options); updateAppWidgetOptions(options);
} }