summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/util
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-10-03 21:12:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-10-03 21:12:20 +0000
commit7a372033ac2c9b8def4fb7870d3b3ee3b9db425f (patch)
tree8dd5818eb592dd8e751421cb4fd2877829bfdb37 /src/com/android/launcher3/util
parent61e917078a68631cba651c51284980bcd0075161 (diff)
parent66b24572e41a13ba5b85b37cf7be64804299c8f6 (diff)
downloadandroid_packages_apps_Trebuchet-7a372033ac2c9b8def4fb7870d3b3ee3b9db425f.tar.gz
android_packages_apps_Trebuchet-7a372033ac2c9b8def4fb7870d3b3ee3b9db425f.tar.bz2
android_packages_apps_Trebuchet-7a372033ac2c9b8def4fb7870d3b3ee3b9db425f.zip
Merge "Exposing custom actions using keyboard shortcut" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/util')
-rw-r--r--src/com/android/launcher3/util/FocusLogic.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/launcher3/util/FocusLogic.java b/src/com/android/launcher3/util/FocusLogic.java
index 163c953bb..afc45fe35 100644
--- a/src/com/android/launcher3/util/FocusLogic.java
+++ b/src/com/android/launcher3/util/FocusLogic.java
@@ -79,8 +79,7 @@ public class FocusLogic {
return (keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT ||
keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_DOWN ||
keyCode == KeyEvent.KEYCODE_MOVE_HOME || keyCode == KeyEvent.KEYCODE_MOVE_END ||
- keyCode == KeyEvent.KEYCODE_PAGE_UP || keyCode == KeyEvent.KEYCODE_PAGE_DOWN ||
- keyCode == KeyEvent.KEYCODE_DEL || keyCode == KeyEvent.KEYCODE_FORWARD_DEL);
+ keyCode == KeyEvent.KEYCODE_PAGE_UP || keyCode == KeyEvent.KEYCODE_PAGE_DOWN);
}
public static int handleKeyEvent(int keyCode, int [][] map, int iconIdx, int pageIndex,