Merge "Remove divider in Date & Time Settings" into sc-dev
This commit is contained in:
@@ -38,6 +38,10 @@
|
|||||||
android:summary="@string/summary_placeholder"
|
android:summary="@string/summary_placeholder"
|
||||||
settings:userRestriction="no_config_date_time"/>
|
settings:userRestriction="no_config_date_time"/>
|
||||||
|
|
||||||
|
<PreferenceCategory
|
||||||
|
android:key="timezone_preference_category"
|
||||||
|
android:title="@string/date_time_set_timezone_title">
|
||||||
|
|
||||||
<com.android.settingslib.RestrictedSwitchPreference
|
<com.android.settingslib.RestrictedSwitchPreference
|
||||||
android:key="auto_zone"
|
android:key="auto_zone"
|
||||||
android:title="@string/zone_auto_title"
|
android:title="@string/zone_auto_title"
|
||||||
@@ -58,6 +62,7 @@
|
|||||||
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"
|
||||||
/>
|
/>
|
||||||
|
</PreferenceCategory>
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:key="time_format_preference_category"
|
android:key="time_format_preference_category"
|
||||||
|
|||||||
Reference in New Issue
Block a user