Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b am: df824969af

am: 8a2d933b58 * commit '8a2d933b58f60d7c295428c162057a09abe6e7de': Add subtext for default keyboard layout. Change-Id: I7056e5bf83b5e3140df45c4d8b6b4b9cf0eedcc6
2016-05-03 18:43:46 +00:00
parent 55ea25eff7 8a2d933b58
commit 9d95f44205
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(