diff options
| author | RoboErik <epastern@google.com> | 2014-03-12 21:15:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-12 21:15:47 +0000 |
| commit | bcb2839d576f1e91f0085d09c2b279d03053910f (patch) | |
| tree | 386f028af22bcc198f380de63deb4a8cda89c919 /libs | |
| parent | 515d25e79991db17c56244e7b7654f7e8bcbf3c9 (diff) | |
| parent | 306c46884eb3121a981a0d1ed0c5461908c227fc (diff) | |
| download | frameworks_base-bcb2839d576f1e91f0085d09c2b279d03053910f.zip frameworks_base-bcb2839d576f1e91f0085d09c2b279d03053910f.tar.gz frameworks_base-bcb2839d576f1e91f0085d09c2b279d03053910f.tar.bz2 | |
am 306c4688: am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge
* commit '306c46884eb3121a981a0d1ed0c5461908c227fc':
b/12068020 Make kb layouts only unique to vendor/product. Do not merge
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/input/InputReader.cpp | 2 | ||||
| -rw-r--r-- | libs/input/InputReader.h | 3 | ||||
| -rw-r--r-- | libs/input/tests/InputReader_test.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libs/input/InputReader.cpp b/libs/input/InputReader.cpp index d4e1a00..3c037fb 100644 --- a/libs/input/InputReader.cpp +++ b/libs/input/InputReader.cpp @@ -911,7 +911,7 @@ void InputDevice::configure(nsecs_t when, const InputReaderConfiguration* config if (!changes || (changes & InputReaderConfiguration::CHANGE_KEYBOARD_LAYOUTS)) { if (!(mClasses & INPUT_DEVICE_CLASS_VIRTUAL)) { sp<KeyCharacterMap> keyboardLayout = - mContext->getPolicy()->getKeyboardLayoutOverlay(mIdentifier.descriptor); + mContext->getPolicy()->getKeyboardLayoutOverlay(mIdentifier); if (mContext->getEventHub()->setKeyboardLayoutOverlay(mId, keyboardLayout)) { bumpGeneration(); } diff --git a/libs/input/InputReader.h b/libs/input/InputReader.h index eb5746b..6b5ce34 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; diff --git a/libs/input/tests/InputReader_test.cpp b/libs/input/tests/InputReader_test.cpp index f068732..aaa973d 100644 --- a/libs/input/tests/InputReader_test.cpp +++ b/libs/input/tests/InputReader_test.cpp @@ -186,7 +186,7 @@ private: mInputDevices = inputDevices; } - virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const String8& inputDeviceDescriptor) { + virtual sp<KeyCharacterMap> getKeyboardLayoutOverlay(const InputDeviceIdentifier& identifier) { return NULL; } |