diff options
| author | Winson Chung <winsonc@google.com> | 2013-07-25 18:17:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-25 18:17:12 +0000 |
| commit | 18350f2dc483a92429f0b35c15ffd33a8ae41098 (patch) | |
| tree | 59ff235c2e0ddb3e9546d624296077ce2c7a06ac /src | |
| parent | 47b5031c703dbee491af9f49e6e08865452d57ef (diff) | |
| parent | a1f133de788823603a2c62aba5dc5d84c5a39cc6 (diff) | |
| download | android_packages_apps_Trebuchet-18350f2dc483a92429f0b35c15ffd33a8ae41098.tar.gz android_packages_apps_Trebuchet-18350f2dc483a92429f0b35c15ffd33a8ae41098.tar.bz2 android_packages_apps_Trebuchet-18350f2dc483a92429f0b35c15ffd33a8ae41098.zip | |
Merge "Updating focus helper to account for change in Folder layout hierarchy. (Bug 9626867)" into jb-ub-gel-agar
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/FocusHelper.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index a591433f2..1acaf3e3b 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -21,6 +21,7 @@ import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; import android.view.ViewParent; +import android.widget.ScrollView; import android.widget.TabHost; import android.widget.TabWidget; @@ -817,7 +818,8 @@ public class FocusHelper { static boolean handleFolderKeyEvent(View v, int keyCode, KeyEvent e) { ShortcutAndWidgetContainer parent = (ShortcutAndWidgetContainer) v.getParent(); final CellLayout layout = (CellLayout) parent.getParent(); - final Folder folder = (Folder) layout.getParent(); + final ScrollView scrollView = (ScrollView) layout.getParent(); + final Folder folder = (Folder) scrollView.getParent(); View title = folder.mFolderName; final int action = e.getAction(); |