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

Commit eea82837 authored by Jagrut Desai's avatar Jagrut Desai Committed by Android (Google) Code Review
Browse files

Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev

parents 134bea19 c36081b8

AndroidManifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -1003,6 +1003,22 @@ 
                       android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$NavigationModeSettingsActivity"

            android:label="@string/system_navigation_title"

            android:exported="true">

            <intent-filter>

                <action android:name="com.android.settings.NAVIGATION_MODE_SETTINGS"/>

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

            </intent-filter>

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

                android:value="com.android.settings.gestures.SystemNavigationGestureSettings"/>

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

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

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

                android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$RegionalPreferencesActivity"

            android:label="@string/regional_preferences_title"

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ public class Settings extends SettingsActivity { 
    /** Activity for the regional preferences settings. */

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

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

    /** Activity for the navigation mode settings. */

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

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

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

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

src/com/android/settings/core/gateway/SettingsGateway.java

+1 −0
Original line number Diff line number Diff line
@@ -417,5 +417,6 @@ public class SettingsGateway { 
            Settings.ModuleLicensesActivity.class.getName(),

            UserBackupSettingsActivity.class.getName(),

            Settings.MemtagPageActivity.class.getName(),

            Settings.NavigationModeSettingsActivity.class.getName(),

    };

}