diff options
author | Adam Cohen <adamcohen@google.com> | 2011-09-18 16:01:29 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-18 16:01:29 -0700 |
commit | 31e8624c4535e995d80d3df47823c1981ef71b70 (patch) | |
tree | cd254be8edc6b9036ba3cd4738f94eea336cdfdb /src | |
parent | 9627936d4f4fd4ec089f121db4aaf387545d843f (diff) | |
parent | cbf47e38e24cc0d63b4bd3f345c050216f06f404 (diff) | |
download | android_packages_apps_Trebuchet-31e8624c4535e995d80d3df47823c1981ef71b70.tar.gz android_packages_apps_Trebuchet-31e8624c4535e995d80d3df47823c1981ef71b70.tar.bz2 android_packages_apps_Trebuchet-31e8624c4535e995d80d3df47823c1981ef71b70.zip |
Merge "Fixing widget minResizeWidth/Height interpretation (Issue 5327589)" into ics-factoryrom
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/AppWidgetResizeFrame.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/launcher2/AppWidgetResizeFrame.java b/src/com/android/launcher2/AppWidgetResizeFrame.java index c7dbc0f77..476219374 100644 --- a/src/com/android/launcher2/AppWidgetResizeFrame.java +++ b/src/com/android/launcher2/AppWidgetResizeFrame.java @@ -64,11 +64,13 @@ public class AppWidgetResizeFrame extends FrameLayout { public static final int RIGHT = 2; public static final int BOTTOM = 3; + private Launcher mLauncher; + public AppWidgetResizeFrame(Context context, ItemInfo itemInfo, LauncherAppWidgetHostView widgetView, CellLayout cellLayout, DragLayer dragLayer) { super(context); - mContext = context; + mLauncher = (Launcher) context; mItemInfo = itemInfo; mCellLayout = cellLayout; mWidgetView = widgetView; @@ -77,7 +79,7 @@ public class AppWidgetResizeFrame extends FrameLayout { mWorkspace = (Workspace) dragLayer.findViewById(R.id.workspace); final AppWidgetProviderInfo info = widgetView.getAppWidgetInfo(); - int[] result = mCellLayout.rectToCell(info.minResizeWidth, info.minResizeHeight, null); + int[] result = mLauncher.getMinResizeSpanForWidget(info, null); mMinHSpan = result[0]; mMinVSpan = result[1]; @@ -123,7 +125,7 @@ public class AppWidgetResizeFrame extends FrameLayout { mRightHandle.setVisibility(GONE); } - final float density = mContext.getResources().getDisplayMetrics().density; + final float density = mLauncher.getResources().getDisplayMetrics().density; mBackgroundPadding = (int) Math.ceil(density * BACKGROUND_PADDING); mTouchTargetWidth = 2 * mBackgroundPadding; } diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index ac7f6495f..29f3f252b 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -902,6 +902,10 @@ public final class Launcher extends Activity return getSpanForWidget(info.provider, info.minWidth, info.minHeight, spanXY); } + int[] getMinResizeSpanForWidget(AppWidgetProviderInfo info, int[] spanXY) { + return getSpanForWidget(info.provider, info.minResizeWidth, info.minResizeHeight, spanXY); + } + int[] getSpanForWidget(PendingAddWidgetInfo info, int[] spanXY) { return getSpanForWidget(info.componentName, info.minWidth, info.minHeight, spanXY); } |