diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index c3edb99..b6393ca 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -902,6 +902,10 @@
         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);
     }
