PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add label for default keyboard layout.

Browse Source 
Bug: 6110399
Change-Id: I2431b99884cbd01de32f8cd6c14a3afbd18b5020
This commit is contained in:
Jeff Brown
2012-04-17 13:55:15 -07:00
parent afdadec674
commit 512d0cb3eb
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -2633,6 +2633,8 @@
<string name="keyboard_layout_picker_title">Choose keyboard layout</string> <string name="keyboard_layout_picker_title">Choose keyboard layout</string>
<!-- String to show when no keyboard layouts are available. [CHAR LIMIT=60] --> <!-- 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> <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 --><skip />
<!-- User dictionary settings, The titlebar text of the User dictionary settings screen. --> <!-- User dictionary settings, The titlebar text of the User dictionary settings screen. -->

2
src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
View File

@@ -420,6 +420,8 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
pref.setTitle(device.getName()); pref.setTitle(device.getName());
if (keyboardLayout != null) { if (keyboardLayout != null) {
pref.setSummary(keyboardLayout.getLabel()); pref.setSummary(keyboardLayout.getLabel());
} else {
pref.setSummary(R.string.keyboard_layout_default_label);
} }
pref.setIntent(intent); pref.setIntent(intent);
mHardKeyboardPreferenceList.add(pref); mHardKeyboardPreferenceList.add(pref);

8
src/com/android/settings/inputmethod/KeyboardLayoutPicker.java
View File

@@ -110,8 +110,12 @@ public class KeyboardLayoutPicker extends ListFragment
public KeyboardLayout[] loadInBackground() { public KeyboardLayout[] loadInBackground() {
InputManager im = (InputManager)getContext().getSystemService(Context.INPUT_SERVICE); InputManager im = (InputManager)getContext().getSystemService(Context.INPUT_SERVICE);
KeyboardLayout[] list = im.getKeyboardLayouts(); KeyboardLayout[] list = im.getKeyboardLayouts();
Arrays.sort(list); KeyboardLayout[] listWithDefault = new KeyboardLayout[list.length + 1];
return list; 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 @Override