Refactor Date & Time Settings
- Rid off AbstractPreferenceController Test: robotest Bug: 235445309 Change-Id: I61118a0ff580231973509c06e84e7088dba897f5
This commit is contained in:
@@ -24,19 +24,22 @@
|
||||
android:key="auto_time"
|
||||
android:title="@string/date_time_auto"
|
||||
settings:useAdditionalSummary="true"
|
||||
settings:userRestriction="no_config_date_time"/>
|
||||
settings:userRestriction="no_config_date_time"
|
||||
settings:controller="com.android.settings.datetime.AutoTimePreferenceController" />
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
android:key="date"
|
||||
android:title="@string/date_time_set_date_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:userRestriction="no_config_date_time"/>
|
||||
settings:userRestriction="no_config_date_time"
|
||||
settings:controller="com.android.settings.datetime.DatePreferenceController" />
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
android:key="time"
|
||||
android:title="@string/date_time_set_time_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
settings:userRestriction="no_config_date_time"/>
|
||||
settings:userRestriction="no_config_date_time"
|
||||
settings:controller="com.android.settings.datetime.TimePreferenceController" />
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="timezone_preference_category"
|
||||
@@ -45,7 +48,8 @@
|
||||
<com.android.settingslib.RestrictedSwitchPreference
|
||||
android:key="auto_zone"
|
||||
android:title="@string/zone_auto_title"
|
||||
settings:userRestriction="no_config_date_time"/>
|
||||
settings:userRestriction="no_config_date_time"
|
||||
settings:controller="com.android.settings.datetime.AutoTimeZonePreferenceController" />
|
||||
|
||||
<com.android.settingslib.widget.BannerMessagePreference
|
||||
android:key="location_time_zone_detection_status"
|
||||
@@ -53,7 +57,7 @@
|
||||
settings:controller="com.android.settings.datetime.LocationProviderStatusPreferenceController"/>
|
||||
|
||||
<!-- This preference gets removed if location-based time zone detection is not supported -->
|
||||
<SwitchPreferenceCompat
|
||||
<SwitchPreference
|
||||
android:key="location_time_zone_detection"
|
||||
android:title="@string/location_time_zone_detection_toggle_title"
|
||||
settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"/>
|
||||
@@ -64,7 +68,8 @@
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:fragment="com.android.settings.datetime.timezone.TimeZoneSettings"
|
||||
settings:userRestriction="no_config_date_time"
|
||||
settings:keywords="@string/keywords_time_zone"/>
|
||||
settings:keywords="@string/keywords_time_zone"
|
||||
settings:controller="com.android.settings.datetime.TimeZonePreferenceController" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
@@ -72,13 +77,15 @@
|
||||
android:key="time_format_preference_category"
|
||||
android:title="@string/time_format_category_title"
|
||||
settings:keywords="@string/keywords_time_format">
|
||||
<SwitchPreferenceCompat
|
||||
<SwitchPreference
|
||||
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" />
|
||||
|
||||
<SwitchPreferenceCompat
|
||||
<SwitchPreference
|
||||
android:key="24 hour"
|
||||
android:title="@string/date_time_24hour" />
|
||||
android:title="@string/date_time_24hour"
|
||||
settings:controller="com.android.settings.datetime.TimeFormatPreferenceController" />
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
Reference in New Issue
Block a user