diff options
author | Jeff Brown <jeffbrown@google.com> | 2012-04-17 14:29:29 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-17 14:29:29 -0700 |
commit | aae7f693ea5d988f837f03ab0e251017506846e3 (patch) | |
tree | be9c118623a6b85de18b52ff25ec2ccfd81e8784 /src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | |
parent | bae78c609a104b8194f7dda770859751a4db4cdd (diff) | |
parent | 512d0cb3eb82d3e95807f018b035fba8a6d48f34 (diff) | |
download | packages_apps_Settings-aae7f693ea5d988f837f03ab0e251017506846e3.zip packages_apps_Settings-aae7f693ea5d988f837f03ab0e251017506846e3.tar.gz packages_apps_Settings-aae7f693ea5d988f837f03ab0e251017506846e3.tar.bz2 |
Merge "Add label for default keyboard layout."
Diffstat (limited to 'src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java')
-rw-r--r-- | src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java | 2 |
1 files changed, 2 insertions, 0 deletions
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); |