commit c58497ee619416c4949b16eb43486c11618b69e5
author Winson Chung <winsonc@google.com> Tue Sep 03 17:48:37 2013 -0700
committer Winson Chung <winsonc@google.com> Thu Sep 05 12:14:28 2013 -0700
tree b8bfd3ec331885a25f42c69fb41dbfd861a4763a
parent 2d8de5845be5f49d3767b8354f0d5479a0715abe

Initial changes to restore AllApps.

- Removes unused all apps code due to dynamic grid/spacing
- Attempts to use CellLayout instead of PagedViewCellLayout

Change-Id: I3c49bca9fc35dfeaf250591fd63bc7f36119968f

src/com/android/launcher3/FocusHelper.java

diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java
index 1acaf3e..4600985 100644
--- a/src/com/android/launcher3/FocusHelper.java
+++ b/src/com/android/launcher3/FocusHelper.java
@@ -119,9 +119,9 @@
      */
     private static ViewGroup getAppsCustomizePage(ViewGroup container, int index) {
         ViewGroup page = (ViewGroup) ((PagedView) container).getPageAt(index);
-        if (page instanceof PagedViewCellLayout) {
+        if (page instanceof CellLayout) {
             // There are two layers, a PagedViewCellLayout and PagedViewCellLayoutChildren
-            page = (ViewGroup) page.getChildAt(0);
+            page = ((CellLayout) page).getShortcutsAndWidgets();
         }
         return page;
     }
@@ -280,11 +280,11 @@
         ViewGroup itemContainer;
         int countX;
         int countY;
-        if (v.getParent() instanceof PagedViewCellLayoutChildren) {
+        if (v.getParent() instanceof ShortcutAndWidgetContainer) {
             itemContainer = (ViewGroup) v.getParent();
             parentLayout = (ViewGroup) itemContainer.getParent();
-            countX = ((PagedViewCellLayout) parentLayout).getCellCountX();
-            countY = ((PagedViewCellLayout) parentLayout).getCellCountY();
+            countX = ((CellLayout) parentLayout).getCountX();
+            countY = ((CellLayout) parentLayout).getCountY();
         } else {
             itemContainer = parentLayout = (ViewGroup) v.getParent();
             countX = ((PagedViewGridLayout) parentLayout).getCellCountX();