commit c3a609f950a713d995f1968574d8ed7b4449f415
author Sunny Goyal <sunnygoyal@google.com> Thu Feb 26 17:43:50 2015 -0800
committer Sunny Goyal <sunnygoyal@google.com> Wed Mar 04 15:55:47 2015 -0800
tree c83ece3c193a95e623997aa13ee913181b26029d
parent 8dbf0fff1f424df8db1bbedfe8e5cfd7783a92ea

Refactoring folder content

> Refactoring the CellLayout in folder with a custom view so
that it can be replaced easily with a scrollable paged view.
> Moving some methods from the folder to this new view which
assume a single page layout for the folder
> Changing folder from LinearLayout to FrameLayout to properly
handle focus traversal in case of multi-page folders

Change-Id: I073c00b995488f9f5d8123b00357e094ca2cec7c

src/com/android/launcher3/FocusHelper.java

diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java
index bdfd7b2..3ca16d4 100644
--- a/src/com/android/launcher3/FocusHelper.java
+++ b/src/com/android/launcher3/FocusHelper.java
@@ -22,7 +22,6 @@
 import android.view.SoundEffectConstants;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ScrollView;
 
 import com.android.launcher3.util.FocusLogic;
 
@@ -354,8 +353,7 @@
         // Initialize the variables.
         ShortcutAndWidgetContainer parent = (ShortcutAndWidgetContainer) v.getParent();
         final CellLayout layout = (CellLayout) parent.getParent();
-        final ScrollView scrollView = (ScrollView) layout.getParent();
-        final Folder folder = (Folder) scrollView.getParent();
+        final Folder folder = (Folder) layout.getParent().getParent();
         View title = folder.mFolderName;
         Workspace workspace = (Workspace) v.getRootView().findViewById(R.id.workspace);
         final int countX = layout.getCountX();