Merge "Update the datetime page UI" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
f515a0a440
@@ -57,7 +57,7 @@
|
|||||||
settings:controller="com.android.settings.datetime.LocationProviderStatusPreferenceController"/>
|
settings:controller="com.android.settings.datetime.LocationProviderStatusPreferenceController"/>
|
||||||
|
|
||||||
<!-- This preference gets removed if location-based time zone detection is not supported -->
|
<!-- This preference gets removed if location-based time zone detection is not supported -->
|
||||||
<SwitchPreference
|
<SwitchPreferenceCompat
|
||||||
android:key="location_time_zone_detection"
|
android:key="location_time_zone_detection"
|
||||||
android:title="@string/location_time_zone_detection_toggle_title"
|
android:title="@string/location_time_zone_detection_toggle_title"
|
||||||
settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"/>
|
settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"/>
|
||||||
@@ -77,12 +77,12 @@
|
|||||||
android:key="time_format_preference_category"
|
android:key="time_format_preference_category"
|
||||||
android:title="@string/time_format_category_title"
|
android:title="@string/time_format_category_title"
|
||||||
settings:keywords="@string/keywords_time_format">
|
settings:keywords="@string/keywords_time_format">
|
||||||
<SwitchPreference
|
<SwitchPreferenceCompat
|
||||||
android:key="auto_24hour"
|
android:key="auto_24hour"
|
||||||
android:title="@string/date_time_24hour_auto"
|
android:title="@string/date_time_24hour_auto"
|
||||||
settings:controller="com.android.settings.datetime.AutoTimeFormatPreferenceController" />
|
settings:controller="com.android.settings.datetime.AutoTimeFormatPreferenceController" />
|
||||||
|
|
||||||
<SwitchPreference
|
<SwitchPreferenceCompat
|
||||||
android:key="24 hour"
|
android:key="24 hour"
|
||||||
android:title="@string/date_time_24hour"
|
android:title="@string/date_time_24hour"
|
||||||
settings:controller="com.android.settings.datetime.TimeFormatPreferenceController" />
|
settings:controller="com.android.settings.datetime.TimeFormatPreferenceController" />
|
||||||
|
Reference in New Issue
Block a user