summaryrefslogtreecommitdiff
path: root/libs/input/KeyCharacterMap.cpp
diff options
context:
space:
mode:
author Siarhei Vishniakou <svv@google.com> 2018-02-15 21:04:49 -0600
committer Siarhei Vishniakou <svv@google.com> 2018-02-21 18:34:10 -0800
commit61da25aa581d2d7994b9d727b5e6f9419df68c8a (patch)
treec7a0f2d34ef4d39a5695f951f2c085e1a1ea0de8 /libs/input/KeyCharacterMap.cpp
parentc1d316f4edfa8a91aafe51d9ac2c8cd2199b8f76 (diff)
Move SPECIAL_FUNCTION from .kcm to .idc files
Currently, the only use of device-specific .kcm files is to specify SPECIAL_FUNCTION flag (meaning that this keyboard is only used to perform system control functions and not for typing). Instead of adding a special .kcm file, use .idc files with se keyboard.specialFunction = 1 to achieve the same functionality. This allows the removal of all device-specific .kcm files. The .kcm functionality will remain in P (with a warning). The functionality will be removed in Q. Bug: 67718661 Test: tested the codepath on Android wear device via logging Change-Id: I1b4572456fa42caae1282dd8d3557820671b3610
Diffstat (limited to 'libs/input/KeyCharacterMap.cpp')
-rw-r--r--libs/input/KeyCharacterMap.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp
index 0627ca6d6f..cba1111606 100644
--- a/libs/input/KeyCharacterMap.cpp
+++ b/libs/input/KeyCharacterMap.cpp
@@ -824,6 +824,9 @@ status_t KeyCharacterMap::Parser::parseType() {
} else if (typeToken == "FULL") {
type = KEYBOARD_TYPE_FULL;
} else if (typeToken == "SPECIAL_FUNCTION") {
+ ALOGW("The SPECIAL_FUNCTION type is now declared in the device's IDC file, please set "
+ "the property 'keyboard.specialFunction' to '1' there instead.");
+ // TODO: return BAD_VALUE here in Q
type = KEYBOARD_TYPE_SPECIAL_FUNCTION;
} else if (typeToken == "OVERLAY") {
type = KEYBOARD_TYPE_OVERLAY;