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

am: 12c2c2538b

* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
  Add subtext for default keyboard layout.

Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282

res/values/strings.xml

@@ -3673,6 +3673,9 @@
         e.g. English (US) - X Keyboard -->
     <string name="physical_device_title"><xliff:g id="input_method_subtype" example="English (US)">%1$s</xliff:g> - <xliff:g id="input_method_editor" example="X Keyboard">%2$s</xliff:g></string>
 
+    <!-- Summary text for keyboards when no layout has been selected. [CHAR LIMIT=35] -->
+    <string name="default_keyboard_layout">Default</string>
+
     <!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
     <string name="pointer_settings_category">Mouse/trackpad</string>
     <!-- On Languages & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->

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(