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

Commit 5fc863fc authored by Tom Hsu's avatar Tom Hsu Committed by Android (Google) Code Review
Browse files

Merge "Expose the regional preferences page"

parents 72baf601 c03ff3b8

AndroidManifest.xml

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

        </activity>



        <activity

            android:name=".Settings$RegionalPreferencesActivity"

            android:label="@string/regional_preferences_title"

            android:exported="true" >

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

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

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

            </intent-filter>

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

                android:value="com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment"/>

            <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$KeyboardSettingsActivity"

            android:label="@string/keyboard_settings"

src/com/android/settings/Settings.java

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ public class Settings extends SettingsActivity { 
    public static class LocalePickerActivity extends SettingsActivity { /* empty */ }

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

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

    /** Activity for the regional preferences settings. */

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

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

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

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

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

+3 −1
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ import com.android.settings.print.PrintJobSettingsFragment; 
import com.android.settings.print.PrintSettingsFragment;

import com.android.settings.privacy.PrivacyControlsFragment;

import com.android.settings.privacy.PrivacyDashboardFragment;

import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;

import com.android.settings.security.LockscreenDashboardFragment;

import com.android.settings.security.MemtagPage;

import com.android.settings.security.SecurityAdvancedSettings;
@@ -367,7 +368,8 @@ public class SettingsGateway { 
            TurnScreenOnDetails.class.getName(),

            NfcAndPaymentFragment.class.getName(),

            ColorAndMotionFragment.class.getName(),

            LongBackgroundTasksDetails.class.getName()

            LongBackgroundTasksDetails.class.getName(),

            RegionalPreferencesEntriesFragment.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {