Merge "Expose the regional preferences page" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
13d90e8024
@@ -1127,6 +1127,38 @@
|
|||||||
android:value="true"/>
|
android:value="true"/>
|
||||||
</activity>
|
</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
|
<activity
|
||||||
android:name=".Settings$KeyboardSettingsActivity"
|
android:name=".Settings$KeyboardSettingsActivity"
|
||||||
android:label="@string/keyboard_settings"
|
android:label="@string/keyboard_settings"
|
||||||
|
@@ -98,6 +98,8 @@ public class Settings extends SettingsActivity {
|
|||||||
public static class LanguageSettingsActivity extends SettingsActivity { /* empty */ }
|
public static class LanguageSettingsActivity extends SettingsActivity { /* empty */ }
|
||||||
/** Activity for the regional preferences settings. */
|
/** Activity for the regional preferences settings. */
|
||||||
public static class RegionalPreferencesActivity 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 KeyboardSettingsActivity extends SettingsActivity { /* empty */ }
|
public static class KeyboardSettingsActivity extends SettingsActivity { /* empty */ }
|
||||||
/** Activity for the navigation mode settings. */
|
/** Activity for the navigation mode settings. */
|
||||||
public static class NavigationModeSettingsActivity extends SettingsActivity { /* empty */ }
|
public static class NavigationModeSettingsActivity extends SettingsActivity { /* empty */ }
|
||||||
|
@@ -182,7 +182,9 @@ import com.android.settings.privacy.PrivacyDashboardFragment;
|
|||||||
import com.android.settings.privatespace.delete.PrivateSpaceDeleteFragment;
|
import com.android.settings.privatespace.delete.PrivateSpaceDeleteFragment;
|
||||||
import com.android.settings.privatespace.delete.PrivateSpaceDeletionProgressFragment;
|
import com.android.settings.privatespace.delete.PrivateSpaceDeletionProgressFragment;
|
||||||
import com.android.settings.privatespace.onelock.PrivateSpaceBiometricSettings;
|
import com.android.settings.privatespace.onelock.PrivateSpaceBiometricSettings;
|
||||||
|
import com.android.settings.regionalpreferences.FirstDayOfWeekItemFragment;
|
||||||
import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;
|
import com.android.settings.regionalpreferences.RegionalPreferencesEntriesFragment;
|
||||||
|
import com.android.settings.regionalpreferences.TemperatureUnitFragment;
|
||||||
import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;
|
import com.android.settings.safetycenter.MoreSecurityPrivacyFragment;
|
||||||
import com.android.settings.security.LockscreenDashboardFragment;
|
import com.android.settings.security.LockscreenDashboardFragment;
|
||||||
import com.android.settings.security.MemtagPage;
|
import com.android.settings.security.MemtagPage;
|
||||||
@@ -395,6 +397,8 @@ public class SettingsGateway {
|
|||||||
ColorContrastFragment.class.getName(),
|
ColorContrastFragment.class.getName(),
|
||||||
LongBackgroundTasksDetails.class.getName(),
|
LongBackgroundTasksDetails.class.getName(),
|
||||||
RegionalPreferencesEntriesFragment.class.getName(),
|
RegionalPreferencesEntriesFragment.class.getName(),
|
||||||
|
TemperatureUnitFragment.class.getName(),
|
||||||
|
FirstDayOfWeekItemFragment.class.getName(),
|
||||||
BatteryInfoFragment.class.getName(),
|
BatteryInfoFragment.class.getName(),
|
||||||
UserAspectRatioDetails.class.getName(),
|
UserAspectRatioDetails.class.getName(),
|
||||||
ScreenTimeoutSettings.class.getName(),
|
ScreenTimeoutSettings.class.getName(),
|
||||||
|
Reference in New Issue
Block a user