commit 892c74d460ad98c6306420e1127c9aa3e505ba25
author Winson Chung <winsonc@google.com> Thu Aug 22 16:15:50 2013 -0700
committer Winson Chung <winsonc@google.com> Fri Aug 23 12:13:02 2013 -0700
tree 5abbb89efdad34335ef876284d520f6c7a705e3f
parent fe14e04987a8baf77f0ffbd6d66839f33a4f0474

Fixing folders to always show in view, removing old assets and references to LauncherModel count.

src/com/android/launcher3/AppsCustomizePagedView.java

diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java
index 245d7ea..899b1f2 100644
--- a/src/com/android/launcher3/AppsCustomizePagedView.java
+++ b/src/com/android/launcher3/AppsCustomizePagedView.java
@@ -438,6 +438,9 @@
     }
 
     public void onPackagesUpdated(ArrayList<Object> widgetsAndShortcuts) {
+        LauncherAppState app = LauncherAppState.getInstance();
+        DeviceProfile grid = app.getDynamicGrid().getDeviceProfile();
+
         // Get the list of widgets and shortcuts
         mWidgets.clear();
         for (Object o : widgetsAndShortcuts) {
@@ -450,8 +453,8 @@
                     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() &&
-                        minSpanY <= LauncherModel.getCellCountY()) {
+                    if (minSpanX <= (int) grid.numColumns &&
+                        minSpanY <= (int) grid.numRows) {
                         mWidgets.add(widget);
                     } else {
                         Log.e(TAG, "Widget " + widget.provider + " can not fit on this device (" +