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

Merge "Place GeoTZ toggle under auto time zone toggle." into sc-dev am: c51cefb2b9

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

Change-Id: I4349a87c81688c481d4859698fdc5bd77b803850
This commit is contained in:
Almaz Mingaleev
2021-04-29 19:49:18 +00:00
committed by Automerger Merge Worker
parent d6e7c97468 c51cefb2b9
commit 74d2521f17
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
res/xml/date_time_prefs.xml
View File

@@ -48,6 +48,12 @@
settings:allowDividerAbove="true"
settings:userRestriction="no_config_date_time"/>
<!-- 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"/>
<com.android.settingslib.RestrictedPreference
android:key="timezone"
android:title="@string/date_time_set_timezone_title"
@@ -56,12 +62,6 @@
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