summaryrefslogtreecommitdiffstats
path: root/include/input/Keyboard.h
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-12-07 17:07:16 -0800
committerSteve Kondik <steve@cyngn.com>2015-12-07 17:07:16 -0800
commit4951bcc16e99daafc44581e4222f012f9d419ae0 (patch)
tree7be00878227a20b4610649a7d455db2d9cb3463c /include/input/Keyboard.h
parent53602ffde5527c476a1d7d39da12ecd7f58917f4 (diff)
parenta78c2e65e13cace4fdbb0295beca5b11de9fde06 (diff)
downloadframeworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.zip
frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.gz
frameworks_native-4951bcc16e99daafc44581e4222f012f9d419ae0.tar.bz2
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/native into cm-13.0
Android 6.0.1 release 3 Change-Id: I437aaf148d440a8144afe1454948980fc3b40cca
Diffstat (limited to 'include/input/Keyboard.h')
-rw-r--r--include/input/Keyboard.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/input/Keyboard.h b/include/input/Keyboard.h
index 519bb22..d4903e9 100644
--- a/include/input/Keyboard.h
+++ b/include/input/Keyboard.h
@@ -88,6 +88,13 @@ extern bool isEligibleBuiltInKeyboard(const InputDeviceIdentifier& deviceIdentif
extern int32_t updateMetaState(int32_t keyCode, bool down, int32_t oldMetaState);
/**
+ * Normalizes the meta state such that if either the left or right modifier
+ * meta state bits are set then the result will also include the universal
+ * bit for that modifier.
+ */
+extern int32_t normalizeMetaState(int32_t oldMetaState);
+
+/**
* Returns true if a key is a meta key like ALT or CAPS_LOCK.
*/
extern bool isMetaKey(int32_t keyCode);