diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-02-26 17:43:50 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-03-04 15:55:47 -0800 |
commit | c3a609f950a713d995f1968574d8ed7b4449f415 (patch) | |
tree | c83ece3c193a95e623997aa13ee913181b26029d /src/com/android/launcher3/FocusHelper.java | |
parent | 8dbf0fff1f424df8db1bbedfe8e5cfd7783a92ea (diff) | |
download | android_packages_apps_Trebuchet-c3a609f950a713d995f1968574d8ed7b4449f415.tar.gz android_packages_apps_Trebuchet-c3a609f950a713d995f1968574d8ed7b4449f415.tar.bz2 android_packages_apps_Trebuchet-c3a609f950a713d995f1968574d8ed7b4449f415.zip |
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
Diffstat (limited to 'src/com/android/launcher3/FocusHelper.java')
-rw-r--r-- | src/com/android/launcher3/FocusHelper.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index bdfd7b287..3ca16d476 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -22,7 +22,6 @@ import android.view.KeyEvent; 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 @@ public class FocusHelper { // 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(); |