summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2014-05-09 00:33:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-09 00:33:32 +0000
commitdfeab22a1ecaed9d73a2261e80ed4938b5c426b0 (patch)
treea882677f3cd4d99cc11f6380cfe7dc2c116e86ed /core
parent66f29aa4a5869a628e45e715f6fc45dc79b55c95 (diff)
parent786efab54d63137d7ddc0f2529076038f34932d7 (diff)
downloadframeworks_base-dfeab22a1ecaed9d73a2261e80ed4938b5c426b0.zip
frameworks_base-dfeab22a1ecaed9d73a2261e80ed4938b5c426b0.tar.gz
frameworks_base-dfeab22a1ecaed9d73a2261e80ed4938b5c426b0.tar.bz2
am 86d53d01: Merge "Temporarily remove the dpad keys from system keys."
* commit '86d53d0107e829c537490c97700397452c728556': Temporarily remove the dpad keys from system keys.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/KeyEvent.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index 05e202b..2d1016a 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -1685,10 +1685,6 @@ public class KeyEvent extends InputEvent implements Parcelable {
case KeyEvent.KEYCODE_BRIGHTNESS_DOWN:
case KeyEvent.KEYCODE_BRIGHTNESS_UP:
case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:
- case KeyEvent.KEYCODE_DPAD_UP:
- case KeyEvent.KEYCODE_DPAD_RIGHT:
- case KeyEvent.KEYCODE_DPAD_DOWN:
- case KeyEvent.KEYCODE_DPAD_LEFT:
return true;
}