Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea8772a9 authored by Clara Bayarri's avatar Clara Bayarri
Browse files

Add Keyboard Shortcuts Helper entry in Settings 

Bug: 27811273
Change-Id: Ic4a97c869d6476bf427e41023dc595b39589e6ce
parent 4ffa5c8a

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -3636,6 +3636,10 @@ 
    <string name="show_ime">Show virtual keyboard</string>

    <!-- Summary text for the 'add virtual keyboard' preference sub-screen. [CHAR LIMIT=100] -->

    <string name="show_ime_summary">Keep it on screen while physical keyboard is active</string>

    <!-- Title for the button to trigger the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=35] -->

    <string name="keyboard_shortcuts_helper">Keyboard shortcuts helper</string>

    <!-- Summary text for the 'keyboard shortcuts helper' dialog. [CHAR LIMIT=100] -->

    <string name="keyboard_shortcuts_helper_summary">Display available shortcuts</string>

    <!--

        Format string for a physical device in the form: InputMethodSubtype - InputMethodEditor.

        e.g. English (US) - X Keyboard -->

res/xml/physical_keyboard_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -25,5 +25,10 @@ 
            android:title="@string/show_ime"

            android:summary="@string/show_ime_summary"

            android:defaultValue="false" />



        <Preference

            android:key="keyboard_shortcuts_helper"

            android:title="@string/keyboard_shortcuts_helper"

            android:summary="@string/keyboard_shortcuts_helper_summary" />

    </PreferenceCategory>

</PreferenceScreen>

src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java

+13 −0
Original line number Diff line number Diff line
@@ -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