diff options
author | Conley Owens <cco3@android.com> | 2011-04-29 10:24:03 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 10:24:03 -0700 |
commit | fbe9bcf4af5427e01d51210e03067eb55cfff86a (patch) | |
tree | f01a1dfde5fd182908f3ee00e99b87ba7be556a6 | |
parent | 1a846ab089878a6b342c6bc3e8850fc2e0ef3080 (diff) | |
parent | 8ebf35589dd2bee84ad93613df21666b8858a10f (diff) | |
download | frameworks_base-fbe9bcf4af5427e01d51210e03067eb55cfff86a.zip frameworks_base-fbe9bcf4af5427e01d51210e03067eb55cfff86a.tar.gz frameworks_base-fbe9bcf4af5427e01d51210e03067eb55cfff86a.tar.bz2 |
am 8ebf3558: Merge "Implement support for ALT and SHIFT modifiers"
* commit '8ebf35589dd2bee84ad93613df21666b8858a10f':
Implement support for ALT and SHIFT modifiers
-rw-r--r-- | libs/ui/InputDispatcher.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp index 46baf9d..c0872e5 100644 --- a/libs/ui/InputDispatcher.cpp +++ b/libs/ui/InputDispatcher.cpp @@ -37,7 +37,9 @@ // Log debug messages about the app switch latency optimization. #define DEBUG_APP_SWITCH 0 +#include <android/input.h> #include <cutils/log.h> +#include <ui/Input.h> #include <ui/InputDispatcher.h> #include <ui/PowerManager.h> @@ -2094,6 +2096,26 @@ void InputDispatcher::notifyKey(nsecs_t eventTime, int32_t deviceId, int32_t sou return; } + /* According to http://source.android.com/porting/keymaps_keyboard_input.html + * Key definitions: Key definitions follow the syntax key SCANCODE KEYCODE [FLAGS...], + * where SCANCODE is a number, KEYCODE is defined in your specific keylayout file + * (android.keylayout.xxx), and potential FLAGS are defined as follows: + * SHIFT: While pressed, the shift key modifier is set + * ALT: While pressed, the alt key modifier is set + * CAPS: While pressed, the caps lock key modifier is set + * Since KeyEvent.java doesn't check if Cap lock is ON and we don't have a + * modifer state for cap lock, we will not support it. + */ + if (policyFlags & POLICY_FLAG_ALT) { + metaState |= AMETA_ALT_ON | AMETA_ALT_LEFT_ON; + } + if (policyFlags & POLICY_FLAG_ALT_GR) { + metaState |= AMETA_ALT_ON | AMETA_ALT_RIGHT_ON; + } + if (policyFlags & POLICY_FLAG_SHIFT) { + metaState |= AMETA_SHIFT_ON | AMETA_SHIFT_LEFT_ON; + } + policyFlags |= POLICY_FLAG_TRUSTED; mPolicy->interceptKeyBeforeQueueing(eventTime, deviceId, action, /*byref*/ flags, keyCode, scanCode, /*byref*/ policyFlags); |