diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-05-17 16:33:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-17 16:33:40 -0700 |
| commit | dc9445ba4cb2e261719d3c38956d9cbe1fddcd64 (patch) | |
| tree | 11bfd3bca00e21f2d69f3a477b3f349571b244e8 /packages | |
| parent | 9de61ae0ed40fcb147e09797bfb22dcea0b89df6 (diff) | |
| parent | d9fec5d317c09da6bcc7a54df4e0190a76d21eae (diff) | |
| download | frameworks_base-dc9445ba4cb2e261719d3c38956d9cbe1fddcd64.zip frameworks_base-dc9445ba4cb2e261719d3c38956d9cbe1fddcd64.tar.gz frameworks_base-dc9445ba4cb2e261719d3c38956d9cbe1fddcd64.tar.bz2 | |
Merge "Add support for grouping keyboard layouts by collection." into jb-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/InputDevices/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | packages/InputDevices/res/values/strings.xml | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/packages/InputDevices/AndroidManifest.xml b/packages/InputDevices/AndroidManifest.xml index 6831a74..f0e4abc 100644 --- a/packages/InputDevices/AndroidManifest.xml +++ b/packages/InputDevices/AndroidManifest.xml @@ -8,7 +8,8 @@ android:label="@string/app_label" android:process="system"> - <receiver android:name=".InputDeviceReceiver"> + <receiver android:name=".InputDeviceReceiver" + android:label="@string/keyboard_layouts_label"> <intent-filter> <action android:name="android.hardware.input.action.QUERY_KEYBOARD_LAYOUTS" /> </intent-filter> diff --git a/packages/InputDevices/res/values/strings.xml b/packages/InputDevices/res/values/strings.xml index 140c7d4..c13e606 100644 --- a/packages/InputDevices/res/values/strings.xml +++ b/packages/InputDevices/res/values/strings.xml @@ -3,6 +3,9 @@ <!-- Name of the application. [CHAR LIMIT=35] --> <string name="app_label">Input Devices</string> + <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] --> + <string name="keyboard_layouts_label">Android keyboard</string> + <!-- US English keyboard layout label. [CHAR LIMIT=35] --> <string name="keyboard_layout_english_us_label">English (US)</string> |