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

Commit 39d682a6 authored by Shaowei Shen's avatar Shaowei Shen Committed by Android (Google) Code Review
Browse files

Merge "[Physical Keyboard] Add intent support for PK layout setting page" into main

parents aaee1a15 b7616da0

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ android_library { 
        "android.app.flags-aconfig",

        "android.provider.flags-aconfig",

        "android.security.flags-aconfig",

        "keyboard_flags",

    ],

}

AndroidManifest.xml

+15 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,21 @@ 
                       android:value="@string/menu_key_system"/>

        </activity>



        <activity android:name="Settings$PhysicalKeyboardLayoutPickerActivity"

            android:label="@string/physical_keyboard_layout_picker_title"

            android:exported="true"

            android:clearTaskOnLaunch="true"

            android:featureFlag="com.android.settings.keyboard.keyboard_and_touchpad_a11y_new_page_enabled">

            <intent-filter android:priority="1">

                <action android:name="android.settings.HARD_KEYBOARD_LAYOUT_PICKER_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.inputmethod.NewKeyboardLayoutEnabledLocalesFragment" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                android:value="@string/menu_key_system"/>

        </activity>



        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name="LanguageSettings"

                android:label="@string/language_input_gesture_title"

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -4561,6 +4561,8 @@ 
    <string name="keyboard_a11y_category">Accessibility</string>

    <!-- Title for the 'physical keyboard' settings screen. [CHAR LIMIT=35] -->

    <string name="physical_keyboard_title">Physical keyboard</string>

    <!-- Title for the 'physical keyboard' settings screen. [CHAR LIMIT=35] -->

    <string name="physical_keyboard_layout_picker_title">Physical keyboard layout picker</string>

    <!-- Title for the 'Bounce keys' preference switch. [CHAR LIMIT=35] -->

    <string name="bounce_keys">Bounce keys</string>

    <!-- Summary text for the 'Bounce keys' preference sub-screen. [CHAR LIMIT=300] -->

src/com/android/settings/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ public class Settings extends SettingsActivity { 
    public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }

    public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }

    public static class PhysicalKeyboardActivity extends SettingsActivity { /* empty */ }

    public static class PhysicalKeyboardLayoutPickerActivity extends SettingsActivity {

        /* empty */

    }

    public static class InputMethodAndSubtypeEnablerActivity extends SettingsActivity { /* empty */ }

    public static class SpellCheckersSettingsActivity extends SettingsActivity { /* empty */ }

    public static class LocalePickerActivity extends SettingsActivity { /* empty */ }

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

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ public class InputPeripheralsSettingsUtils { 
    static final String EXTRA_TITLE = "keyboard_layout_picker_title";

    static final String EXTRA_USER_ID = "user_id";

    static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier";

    static final String EXTRA_INPUT_DEVICE = "input_device";

    static final String EXTRA_INPUT_METHOD_INFO = "input_method_info";

    static final String EXTRA_INPUT_METHOD_SUBTYPE = "input_method_subtype";