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

Commit 8143a699 authored by Daniel Huang's avatar Daniel Huang Committed by Android (Google) Code Review
Browse files

Merge "[Update] Expose the regional preferences pages" into main

parents 2184688d 4e1bf7db

AndroidManifest.xml

+48 −0
Original line number Diff line number Diff line
@@ -1117,6 +1117,54 @@ 
                android:value="true"/>

        </activity>



        <activity

            android:name=".Settings$RegionSettingsActivity"

            android:label="@string/region_picker_preference_title"

            android:exported="true" >

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

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

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

            android:label="@string/numbers_preferences_title"

            android:exported="true" >

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

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

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

            android:label="@string/measurement_system_preferences_title"

            android:exported="true" >

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

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

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

res/xml/language_and_region_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
        android:title="@string/numbers_preferences_title"

        android:summary="@string/default_string_of_regional_preference"

        settings:controller="com.android.settings.regionalpreferences.NewNumberingSystemController"

        settings:fragment="com.android.settings.regionalpreferences.NumberingPreferencesFragment">

        settings:fragment="com.android.settings.regionalpreferences.NumberingSystemLocaleListFragment">

      <extra

          android:name="arg_key_regional_preference"

          android:value="arg_value_language_select"/>

src/com/android/settings/Settings.java

+3 −0
Original line number Diff line number Diff line
@@ -100,9 +100,12 @@ public class Settings extends SettingsActivity { 
    public static class LocalePickerActivity extends SettingsActivity { /* empty */ }

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

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

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

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

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

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

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

    public static class NumberingSystemSettingsActivity 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

+6 −0
Original line number Diff line number Diff line
@@ -183,6 +183,9 @@ 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.MeasurementSystemItemFragment;

import com.android.settings.regionalpreferences.NumberingSystemLocaleListFragment;

import com.android.settings.regionalpreferences.RegionPickerFragment;

import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;

import com.android.settings.regionalpreferences.TemperatureUnitFragment;

import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;
@@ -396,9 +399,12 @@ public class SettingsGateway { 
            ColorAndMotionFragment.class.getName(),

            ColorContrastFragment.class.getName(),

            LongBackgroundTasksDetails.class.getName(),

            RegionPickerFragment.class.getName(),

            RegionalPreferencesEntriesFragment.class.getName(),

            TemperatureUnitFragment.class.getName(),

            FirstDayOfWeekItemFragment.class.getName(),

            MeasurementSystemItemFragment.class.getName(),

            NumberingSystemLocaleListFragment.class.getName(),

            BatteryInfoFragment.class.getName(),

            UserAspectRatioDetails.class.getName(),

            ScreenTimeoutSettings.class.getName(),

src/com/android/settings/regionalpreferences/NumberingPreferencesFragment.java

+8 −2
Original line number Diff line number Diff line
@@ -32,8 +32,14 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.Locale;



/** Provides options of numbering system to each language. */

/**

 * Provides options of numbering system to each language.

 *

 * @deprecated Use {@link NumberingSystemLocaleListFragment} instead.

 */

@Deprecated

public class NumberingPreferencesFragment extends DashboardFragment {



    /** Initializes variables. */

    @VisibleForTesting

    String initTitle() {