Merge "Add subtext for default keyboard layout." into nyc-dev

am: 12c2c2538b * commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4': Add subtext for default keyboard layout. Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
2016-05-03 18:34:17 +00:00
parent 5c4e2d741a 12c2c2538b
commit e71a6ac6cd
2 changed files with 6 additions and 0 deletions
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -152,6 +152,9 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
                    KeyboardLayout layout = info.mLayout;
                    if (layout != null) {
                        pref.setSummary(layout.getLabel());
+                    } else {
+                        pref.setSummary(
+                                getPrefContext().getString(R.string.default_keyboard_layout));
                    }
                    pref.setOnPreferenceClickListener(preference -> {
                        showKeyboardLayoutScreen(