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

Commit 13d90e80 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose the regional preferences page" into main

parents 54cc16fd 46a75405

AndroidManifest.xml

+32 −0
Original line number Diff line number Diff line
@@ -1127,6 +1127,38 @@ 
                android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$TemperatureUnitSettingsActivity"

            android:label="@string/temperature_preferences_title"

            android:exported="true" >

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

                <action android:name="android.settings.TEMPERATURE_UNIT_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.TemperatureUnitFragment"/>

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

            android:label="@string/first_day_of_week_preferences_title"

            android:exported="true" >

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

                <action android:name="android.settings.FIRST_DAY_OF_WEEK_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.FirstDayOfWeekItemFragment"/>

            <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
@@ -98,6 +98,8 @@ public class Settings extends SettingsActivity { 
    public static class LanguageSettingsActivity extends SettingsActivity { /* empty */ }

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

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

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

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

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

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

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

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

+4 −0
Original line number Diff line number Diff line
@@ -182,7 +182,9 @@ import com.android.settings.privacy.PrivacyDashboardFragment; 
import com.android.settings.privatespace.delete.PrivateSpaceDeleteFragment;

import com.android.settings.privatespace.delete.PrivateSpaceDeletionProgressFragment;

import com.android.settings.privatespace.onelock.PrivateSpaceBiometricSettings;

import com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment;

import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;

import com.android.settings.regionalpreferences.TemperatureUnitFragment;

import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;

import com.android.settings.security.LockscreenDashboardFragment;

import com.android.settings.security.MemtagPage;
@@ -395,6 +397,8 @@ public class SettingsGateway { 
            ColorContrastFragment.class.getName(),

            LongBackgroundTasksDetails.class.getName(),

            RegionalPreferencesEntriesFragment.class.getName(),

            TemperatureUnitFragment.class.getName(),

            FirstDayOfWeekItemFragment.class.getName(),

            BatteryInfoFragment.class.getName(),

            UserAspectRatioDetails.class.getName(),

            ScreenTimeoutSettings.class.getName(),