PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 12c2c2538b

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

Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
This commit is contained in:
Michael Wright
2016-05-03 18:34:17 +00:00
committed by android-build-merger
parent 5c4e2d741a 12c2c2538b
commit e71a6ac6cd
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/strings.xml
View File

@@ -3673,6 +3673,9 @@
e.g. English (US) - X Keyboard --> 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> <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] --> <!-- 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> <string name="pointer_settings_category">Mouse/trackpad</string>
<!-- On Languages & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] --> <!-- On Languages & input settings screen, setting summary. Setting for mouse pointer speed. [CHAR LIMIT=35] -->

3
src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View File

@@ -152,6 +152,9 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
KeyboardLayout layout = info.mLayout; KeyboardLayout layout = info.mLayout;
if (layout != null) { if (layout != null) {
pref.setSummary(layout.getLabel()); pref.setSummary(layout.getLabel());
} else {
pref.setSummary(
getPrefContext().getString(R.string.default_keyboard_layout));
} }
pref.setOnPreferenceClickListener(preference -> { pref.setOnPreferenceClickListener(preference -> {
showKeyboardLayoutScreen( showKeyboardLayoutScreen(