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

am: df824969af * commit 'df824969af786598f951830bd6ec387606da316a': Add subtext for default keyboard layout. Change-Id: I3f2802ca95c8c0b95967dd52fdc664544f6eeccf
2016-05-03 18:36:48 +00:00
parent f83c49d66f df824969af
commit 8a2d933b58
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(