diff options
| author | Winson Chung <winsonc@google.com> | 2011-06-13 18:15:54 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-06-13 18:47:30 -0700 |
| commit | faa13255de0fb1d581ec7a583ed6ef0b661dbea0 (patch) | |
| tree | 6486f064977b91d11acf8deaf4045d41925a35cf /src/com/android/launcher2/PagedViewWidget.java | |
| parent | 61fa4197c4316bb0f9b05fcefb676f86197a2273 (diff) | |
| download | android_packages_apps_Trebuchet-faa13255de0fb1d581ec7a583ed6ef0b661dbea0.tar.gz android_packages_apps_Trebuchet-faa13255de0fb1d581ec7a583ed6ef0b661dbea0.tar.bz2 android_packages_apps_Trebuchet-faa13255de0fb1d581ec7a583ed6ef0b661dbea0.zip | |
Fixing crash in FocusHelper and removing some old focus code for old Customize layout.
Change-Id: Ifd8a38174bbcf04c0ffeeefb4f42419e82a6ba95
Diffstat (limited to 'src/com/android/launcher2/PagedViewWidget.java')
| -rw-r--r-- | src/com/android/launcher2/PagedViewWidget.java | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java index 2ffa398d1..6ddecf1ec 100644 --- a/src/com/android/launcher2/PagedViewWidget.java +++ b/src/com/android/launcher2/PagedViewWidget.java @@ -257,24 +257,14 @@ public class PagedViewWidget extends LinearLayout implements Checkable { @Override public boolean onKeyDown(int keyCode, KeyEvent event) { - if (LauncherApplication.isScreenLarge()) { - return FocusHelper.handlePagedViewWidgetKeyEvent(this, keyCode, event) - || super.onKeyDown(keyCode, event); - } else { - return FocusHelper.handlePagedViewGridLayoutWidgetKeyEvent(this, keyCode, event) - || super.onKeyDown(keyCode, event); - } + return FocusHelper.handlePagedViewGridLayoutWidgetKeyEvent(this, keyCode, event) + || super.onKeyDown(keyCode, event); } @Override public boolean onKeyUp(int keyCode, KeyEvent event) { - if (LauncherApplication.isScreenLarge()) { - return FocusHelper.handlePagedViewWidgetKeyEvent(this, keyCode, event) - || super.onKeyUp(keyCode, event); - } else { - return FocusHelper.handlePagedViewGridLayoutWidgetKeyEvent(this, keyCode, event) - || super.onKeyUp(keyCode, event); - } + return FocusHelper.handlePagedViewGridLayoutWidgetKeyEvent(this, keyCode, event) + || super.onKeyUp(keyCode, event); } @Override |