commit 2f093b6ad185967c129781526060288e983bc58a
author Adam Cohen <adamcohen@google.com> Mon Apr 30 18:59:53 2012 -0700
committer Adam Cohen <adamcohen@google.com> Mon Apr 30 18:59:53 2012 -0700
tree 2442e9894fa961e6ba61e375bab492448ed976b7
parent accf3bffedc736c04034bfee8e1a8e4fe775f568

Fix widget resizes that shouldn't (issue 6380435)

Change-Id: Ia1da2df16ca184e6f451775597fa33ee38df6122

src/com/android/launcher2/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 3936e59..586177b 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -481,8 +481,8 @@
         for (AppWidgetProviderInfo widget : widgets) {
             if (widget.minWidth > 0 && widget.minHeight > 0) {
                 // Ensure that all widgets we show can be added on a workspace of this size
-                int[] spanXY = mLauncher.getSpanForWidget(widget);
-                int[] minSpanXY = mLauncher.getMinSpanForWidget(widget);
+                int[] spanXY = Launcher.getSpanForWidget(mLauncher, widget);
+                int[] minSpanXY = Launcher.getMinSpanForWidget(mLauncher, widget);
                 int minSpanX = Math.min(spanXY[0], minSpanXY[0]);
                 int minSpanY = Math.min(spanXY[1], minSpanXY[1]);
                 if (minSpanX <= LauncherModel.getCellCountX() &&
@@ -1225,10 +1225,10 @@
                 createItemInfo = new PendingAddWidgetInfo(info, null, null);
 
                 // Determine the widget spans and min resize spans.
-                int[] spanXY = mLauncher.getSpanForWidget(info);
+                int[] spanXY = Launcher.getSpanForWidget(mLauncher, info);
                 createItemInfo.spanX = spanXY[0];
                 createItemInfo.spanY = spanXY[1];
-                int[] minSpanXY = mLauncher.getMinSpanForWidget(info);
+                int[] minSpanXY = Launcher.getMinSpanForWidget(mLauncher, info);
                 createItemInfo.minSpanX = minSpanXY[0];
                 createItemInfo.minSpanY = minSpanXY[1];
 
@@ -1315,7 +1315,7 @@
             Object rawInfo = items.get(i);
             if (rawInfo instanceof AppWidgetProviderInfo) {
                 AppWidgetProviderInfo info = (AppWidgetProviderInfo) rawInfo;
-                int[] cellSpans = mLauncher.getSpanForWidget(info);
+                int[] cellSpans = Launcher.getSpanForWidget(mLauncher, info);
 
                 int maxWidth = Math.min(data.maxImageWidth,
                         mWidgetSpacingLayout.estimateCellWidth(cellSpans[0]));