diff options
| author | 2009-03-18 11:33:14 -0700 | |
|---|---|---|
| committer | 2009-03-18 11:33:14 -0700 | |
| commit | 2a73de7b21a89aa2ba4c254d28658b49793425b2 (patch) | |
| tree | ded5bcd581464b4174d81c373044b6d36eee58d2 /include/ui/KeycodeLabels.h | |
| parent | 42e48026b21a962e5bf40344d738665ecbd9d74d (diff) | |
| parent | ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 (diff) | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
Diffstat (limited to 'include/ui/KeycodeLabels.h')
| -rw-r--r-- | include/ui/KeycodeLabels.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/ui/KeycodeLabels.h b/include/ui/KeycodeLabels.h index 53c118872814..efa6d2bdd3c3 100644 --- a/include/ui/KeycodeLabels.h +++ b/include/ui/KeycodeLabels.h @@ -113,6 +113,7 @@ static const KeycodeLabel KEYCODES[] = { { "PREVIOUSSONG", 88 }, { "REWIND", 89 }, { "FORWARD", 90 }, + { "MUTE", 91 }, // NOTE: If you add a new keycode here you must also add it to: // (enum KeyCode, in this file) @@ -216,7 +217,8 @@ typedef enum KeyCode { kKeyCodeNextSong = 87, kKeyCodePreviousSong = 88, kKeyCodeRewind = 89, - kKeyCodeForward = 90 + kKeyCodeForward = 90, + kKeyCodeMute = 91 } KeyCode; static const KeycodeLabel FLAGS[] = { |