diff --git a/res/values/strings.xml b/res/values/strings.xml index 95a7749c94b..88052b86a9f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3636,6 +3636,10 @@ Show virtual keyboard Keep it on screen while physical keyboard is active + + Keyboard shortcuts helper + + Display available shortcuts diff --git a/res/xml/physical_keyboard_settings.xml b/res/xml/physical_keyboard_settings.xml index 4de26727617..974ba98dfc4 100644 --- a/res/xml/physical_keyboard_settings.xml +++ b/res/xml/physical_keyboard_settings.xml @@ -25,5 +25,10 @@ android:title="@string/show_ime" android:summary="@string/show_ime_summary" android:defaultValue="false" /> + + diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index 7f590a1dcbe..fb44a3d718e 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -61,6 +61,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment private static final int USER_SYSTEM = 0; private static final String KEYBOARD_ASSISTANCE_CATEGORY = "keyboard_assistance_category"; private static final String SHOW_VIRTUAL_KEYBOARD_SWITCH = "show_virtual_keyboard_switch"; + private static final String KEYBOARD_SHORTCUTS_HELPER = "keyboard_shortcuts_helper"; private static final String IM_SUBTYPE_MODE_KEYBOARD = "keyboard"; @NonNull @@ -95,6 +96,14 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment mShowVirtualKeyboardSwitch = Preconditions.checkNotNull( (SwitchPreference) mKeyboardAssistanceCategory.findPreference( SHOW_VIRTUAL_KEYBOARD_SWITCH)); + findPreference(KEYBOARD_SHORTCUTS_HELPER).setOnPreferenceClickListener( + new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + toggleKeyboardShortcutsMenu(); + return true; + } + }); } @Override @@ -245,6 +254,10 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment mShowVirtualKeyboardSwitch.setChecked(mSettings.isShowImeWithHardKeyboardEnabled()); } + private void toggleKeyboardShortcutsMenu() { + getActivity().requestKeyboardShortcutsHelper(); + } + private final OnPreferenceChangeListener mShowVirtualKeyboardSwitchPreferenceChangeListener = new OnPreferenceChangeListener() { @Override