diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-01 14:55:30 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2010-10-01 15:08:56 -0700 |
| commit | 956c0fb2386cb0cf92e08b199c706ed3a044ad1b (patch) | |
| tree | 3c9dfcd253b5a7de7603d24455c1d1d80df5c980 /libs | |
| parent | aa2d67d4b750050f75eac73cdba6ed647cd8bfd2 (diff) | |
| download | frameworks_native-956c0fb2386cb0cf92e08b199c706ed3a044ad1b.zip frameworks_native-956c0fb2386cb0cf92e08b199c706ed3a044ad1b.tar.gz frameworks_native-956c0fb2386cb0cf92e08b199c706ed3a044ad1b.tar.bz2 | |
Support haptic feedback for virtual keys defined in key layout.
Change-Id: I83e4108a87332692e03791dc066206becbc7941f
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ui/InputReader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ui/InputReader.cpp b/libs/ui/InputReader.cpp index 1d35e10..825febc 100644 --- a/libs/ui/InputReader.cpp +++ b/libs/ui/InputReader.cpp @@ -993,7 +993,10 @@ void KeyboardInputMapper::applyPolicyAndDispatch(nsecs_t when, uint32_t policyFl int32_t keyEventAction = down ? AKEY_EVENT_ACTION_DOWN : AKEY_EVENT_ACTION_UP; int32_t keyEventFlags = AKEY_EVENT_FLAG_FROM_SYSTEM; if (policyFlags & POLICY_FLAG_WOKE_HERE) { - keyEventFlags = keyEventFlags | AKEY_EVENT_FLAG_WOKE_HERE; + keyEventFlags |= AKEY_EVENT_FLAG_WOKE_HERE; + } + if (policyFlags & POLICY_FLAG_VIRTUAL) { + keyEventFlags |= AKEY_EVENT_FLAG_VIRTUAL_HARD_KEY; } getDispatcher()->notifyKey(when, getDeviceId(), AINPUT_SOURCE_KEYBOARD, policyFlags, @@ -2162,10 +2165,7 @@ void TouchInputMapper::applyPolicyAndDispatchVirtualKey(nsecs_t when, uint32_t p int32_t keyCode, int32_t scanCode, nsecs_t downTime) { int32_t metaState = mContext->getGlobalMetaState(); - if (keyEventAction == AKEY_EVENT_ACTION_DOWN) { - getPolicy()->virtualKeyDownFeedback(); - } - + policyFlags |= POLICY_FLAG_VIRTUAL; int32_t policyActions = getPolicy()->interceptKey(when, getDeviceId(), keyEventAction == AKEY_EVENT_ACTION_DOWN, keyCode, scanCode, policyFlags); |