diff options
| author | RoboErik <epastern@google.com> | 2013-12-16 11:27:55 -0800 |
|---|---|---|
| committer | RoboErik <epastern@google.com> | 2014-01-07 17:37:24 -0800 |
| commit | fb290df3c9a6f37ec050163029e25844de2f8590 (patch) | |
| tree | eadba9942f884e930224c83d1939ab98db3e1e62 /libs/input/InputReader.h | |
| parent | 6c6a11648fc6ed9bf058fba51d82d467472ed8e6 (diff) | |
| download | frameworks_base-fb290df3c9a6f37ec050163029e25844de2f8590.zip frameworks_base-fb290df3c9a6f37ec050163029e25844de2f8590.tar.gz frameworks_base-fb290df3c9a6f37ec050163029e25844de2f8590.tar.bz2 | |
b/12068020 Make kb layouts only unique to vendor/product
Instead of storing a kb layout per device descriptor (which is expected
to be unique), store it for each vendor/product. This way we can keep
a consistent layout between identical but physically different keyboards.
There are some corner cases this is expected to fail on, namely devices
that incorrectly have the same vendor/product id. Devices that don't
define a vendor/product id will continue to use the descriptor to store
layout files.
Change-Id: Id0890d13e1c859eaf993d4831b7b1acbaf5df80f
Diffstat (limited to 'libs/input/InputReader.h')
| -rw-r--r-- | libs/input/InputReader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/input/InputReader.h b/libs/input/InputReader.h index e6f45b6..674f67d 100644 --- a/libs/input/InputReader.h +++ b/libs/input/InputReader.h @@ -281,7 +281,8 @@ public: virtual void notifyInputDevicesChanged(const Vector<InputDeviceInfo>& inputDevices) = 0; /* Gets the keyboard layout for a particular input device. */ - virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor) = 0; + virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay( + const InputDeviceIdentifier& identifier) = 0; /* Gets a user-supplied alias for a particular input device, or an empty string if none. */ virtual String8 getDeviceAlias(const InputDeviceIdentifier& identifier) = 0; |