commit a5c9636f563a2fa5bd3c97266894e002453b13dc
author Winson Chung <winsonc@google.com> Thu Apr 12 14:04:41 2012 -0700
committer Winson Chung <winsonc@google.com> Thu Apr 12 16:21:17 2012 -0700
tree 7a4a719f462036435cf656894331825d6e434f9d
parent 2c2b28ae557f83b3d114afeedb61c546a503eb99

Preventing widgets that don't fit from showing in tray. (Bug 6331357)

Change-Id: I9cbe85bed5c633f2be9b420eecbbee9a1b171e51

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index f768a39..03c5c08 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -979,11 +979,7 @@
         }
     }
 
-    int[] getSpanForWidget(ComponentName component, int minWidth, int minHeight, int[] spanXY) {
-        if (spanXY == null) {
-            spanXY = new int[2];
-        }
-
+    int[] getSpanForWidget(ComponentName component, int minWidth, int minHeight) {
         Rect padding = AppWidgetHostView.getDefaultPaddingForWidget(this, component, null);
         // We want to account for the extra amount of padding that we are adding to the widget
         // to ensure that it gets the full amount of space that it has requested
@@ -992,21 +988,21 @@
         return CellLayout.rectToCell(getResources(), requiredWidth, requiredHeight, null);
     }
 
-    int[] getSpanForWidget(AppWidgetProviderInfo info, int[] spanXY) {
-        return getSpanForWidget(info.provider, info.minWidth, info.minHeight, spanXY);
+    int[] getSpanForWidget(AppWidgetProviderInfo info) {
+        return getSpanForWidget(info.provider, info.minWidth, info.minHeight);
     }
 
-    int[] getMinSpanForWidget(AppWidgetProviderInfo info, int[] spanXY) {
-        return getSpanForWidget(info.provider, info.minResizeWidth, info.minResizeHeight, spanXY);
+    int[] getMinSpanForWidget(AppWidgetProviderInfo info) {
+        return getSpanForWidget(info.provider, info.minResizeWidth, info.minResizeHeight);
     }
 
-    int[] getSpanForWidget(PendingAddWidgetInfo info, int[] spanXY) {
-        return getSpanForWidget(info.componentName, info.minWidth, info.minHeight, spanXY);
+    int[] getSpanForWidget(PendingAddWidgetInfo info) {
+        return getSpanForWidget(info.componentName, info.minWidth, info.minHeight);
     }
 
-    int[] getMinSpanForWidget(PendingAddWidgetInfo info, int[] spanXY) {
+    int[] getMinSpanForWidget(PendingAddWidgetInfo info) {
         return getSpanForWidget(info.componentName, info.minResizeWidth,
-                info.minResizeHeight, spanXY);
+                info.minResizeHeight);
     }
 
     /**
@@ -1024,8 +1020,8 @@
         // Calculate the grid spans needed to fit this widget
         CellLayout layout = getCellLayout(container, screen);
 
-        int[] minSpanXY = getMinSpanForWidget(appWidgetInfo, null);
-        int[] spanXY = getSpanForWidget(appWidgetInfo, null);
+        int[] minSpanXY = getMinSpanForWidget(appWidgetInfo);
+        int[] spanXY = getSpanForWidget(appWidgetInfo);
 
         // Try finding open space on Launcher screen
         // We have saved the position to which the widget was dragged-- this really only matters