diff options
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/inputmethod/KeyboardLayoutPicker.java | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index aaf51c5..28e9e46 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2629,6 +2629,8 @@ <string name="keyboard_layout_picker_title">Choose keyboard layout</string> <!-- String to show when no keyboard layouts are available. [CHAR LIMIT=60] --> <string name="keyboard_layout_picker_empty_text">No keyboard layouts are available.</string> + <!-- Label of the default keyboard layout. [CHAR LIMIT=35] --> + <string name="keyboard_layout_default_label">Default</string> <!-- User dictionary settings --><skip /> <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. --> diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java index e764a73..b48df03 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java +++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java @@ -420,6 +420,8 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment pref.setTitle(device.getName()); if (keyboardLayout != null) { pref.setSummary(keyboardLayout.getLabel()); + } else { + pref.setSummary(R.string.keyboard_layout_default_label); } pref.setIntent(intent); mHardKeyboardPreferenceList.add(pref); diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPicker.java b/src/com/android/settings/inputmethod/KeyboardLayoutPicker.java index 4cfae56..40b97fc 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPicker.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPicker.java @@ -110,8 +110,12 @@ public class KeyboardLayoutPicker extends ListFragment public KeyboardLayout[] loadInBackground() { InputManager im = (InputManager)getContext().getSystemService(Context.INPUT_SERVICE); KeyboardLayout[] list = im.getKeyboardLayouts(); - Arrays.sort(list); - return list; + KeyboardLayout[] listWithDefault = new KeyboardLayout[list.length + 1]; + listWithDefault[0] = new KeyboardLayout(null, + getContext().getString(R.string.keyboard_layout_default_label)); + System.arraycopy(list, 0, listWithDefault, 1, list.length); + Arrays.sort(listWithDefault); + return listWithDefault; } @Override |