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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java
index 1acaf3e3b..4600985c4 100644
--- a/src/com/android/launcher3/FocusHelper.java
+++ b/src/com/android/launcher3/FocusHelper.java
@@ -119,9 +119,9 @@ public class FocusHelper {
      */
     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 @@ public class FocusHelper {
         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();