PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove divider in Date & Time Settings" into sc-dev am: c603e02d11

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187783

Change-Id: Ie06ec7328e2ae059b3f9d43e29e4b9c2ca7109a4
This commit is contained in:
Edgar Wang
2021-04-26 16:36:18 +00:00
committed by Automerger Merge Worker
parent 03664458f5 c603e02d11
commit aa3b120acb
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
res/xml/date_time_prefs.xml
View File

@@ -38,26 +38,31 @@
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
settings:userRestriction="no_config_date_time"/> settings:userRestriction="no_config_date_time"/>
<com.android.settingslib.RestrictedSwitchPreference <PreferenceCategory
android:key="auto_zone" android:key="timezone_preference_category"
android:title="@string/zone_auto_title" android:title="@string/date_time_set_timezone_title">
settings:allowDividerAbove="true"
settings:userRestriction="no_config_date_time"/>
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="timezone" android:key="auto_zone"
android:title="@string/date_time_set_timezone_title" android:title="@string/zone_auto_title"
android:summary="@string/summary_placeholder" settings:allowDividerAbove="true"
android:fragment="com.android.settings.datetime.timezone.TimeZoneSettings" settings:userRestriction="no_config_date_time"/>
settings:userRestriction="no_config_date_time"
settings:keywords="@string/keywords_time_zone"/>
<!-- This preference gets removed if location-based time zone detection is not supported --> <com.android.settingslib.RestrictedPreference
<SwitchPreference android:key="timezone"
android:key="location_time_zone_detection" android:title="@string/date_time_set_timezone_title"
android:title="@string/location_time_zone_detection_toggle_title" android:summary="@string/summary_placeholder"
settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController" android:fragment="com.android.settings.datetime.timezone.TimeZoneSettings"
/> settings:userRestriction="no_config_date_time"
settings:keywords="@string/keywords_time_zone"/>
<!-- This preference gets removed if location-based time zone detection is not supported -->
<SwitchPreference
android:key="location_time_zone_detection"
android:title="@string/location_time_zone_detection_toggle_title"
settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"
/>
</PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="time_format_preference_category" android:key="time_format_preference_category"