diff options
author | Michael Jurka <mikejurka@google.com> | 2012-03-20 03:18:20 -0700 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2012-03-20 11:13:05 -0700 |
commit | a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4 (patch) | |
tree | 265d71c942c1f99cb8bbc46f31eae23b4b1db231 /src/com/android/launcher2/FocusHelper.java | |
parent | 47a876d443ddc65c8d9a0c95da58d892dbb1faea (diff) | |
download | android_packages_apps_Trebuchet-a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4.tar.gz android_packages_apps_Trebuchet-a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4.tar.bz2 android_packages_apps_Trebuchet-a52570f8f9ad65b85e33a2f2e87722f9edd6c6f4.zip |
Eliminate custom alpha handling in CellLayout
Also rename CellLayoutChildren to ShortcutsAndWidgetsView
Change-Id: Ic2ebc5497adb153cc2fce99730cc2c6fbdc101e6
Diffstat (limited to 'src/com/android/launcher2/FocusHelper.java')
-rw-r--r-- | src/com/android/launcher2/FocusHelper.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/launcher2/FocusHelper.java b/src/com/android/launcher2/FocusHelper.java index 7807b5dcf..ecc9d9c5d 100644 --- a/src/com/android/launcher2/FocusHelper.java +++ b/src/com/android/launcher2/FocusHelper.java @@ -534,7 +534,7 @@ public class FocusHelper { if (handleKeyEvent) { // Select the first bubble text view in the current page of the workspace final CellLayout layout = (CellLayout) workspace.getChildAt(pageIndex); - final CellLayoutChildren children = layout.getChildrenLayout(); + final ShortcutAndWidgetContainer children = layout.getShortcutsAndWidgets(); final View newIcon = getIconInDirection(layout, children, -1, 1); if (newIcon != null) { newIcon.requestFocus(); @@ -556,9 +556,10 @@ public class FocusHelper { /** * Private helper method to get the CellLayoutChildren given a CellLayout index. */ - private static CellLayoutChildren getCellLayoutChildrenForIndex(ViewGroup container, int i) { + private static ShortcutAndWidgetContainer getCellLayoutChildrenForIndex( + ViewGroup container, int i) { ViewGroup parent = (ViewGroup) container.getChildAt(i); - return (CellLayoutChildren) parent.getChildAt(0); + return (ShortcutAndWidgetContainer) parent.getChildAt(0); } /** @@ -664,7 +665,7 @@ public class FocusHelper { * Handles key events in a Workspace containing. */ static boolean handleIconKeyEvent(View v, int keyCode, KeyEvent e) { - CellLayoutChildren parent = (CellLayoutChildren) v.getParent(); + ShortcutAndWidgetContainer parent = (ShortcutAndWidgetContainer) v.getParent(); final CellLayout layout = (CellLayout) parent.getParent(); final Workspace workspace = (Workspace) layout.getParent(); final ViewGroup launcher = (ViewGroup) workspace.getParent(); @@ -819,7 +820,7 @@ public class FocusHelper { * Handles key events for items in a Folder. */ static boolean handleFolderKeyEvent(View v, int keyCode, KeyEvent e) { - CellLayoutChildren parent = (CellLayoutChildren) v.getParent(); + ShortcutAndWidgetContainer parent = (ShortcutAndWidgetContainer) v.getParent(); final CellLayout layout = (CellLayout) parent.getParent(); final Folder folder = (Folder) layout.getParent(); View title = folder.mFolderName; |