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

Merge "Move the Location time zone detection setting"

Browse Source
This commit is contained in:
Neil Fuller
2020-11-10 12:22:18 +00:00
committed by Android (Google) Code Review
parent 58d8cff28b 218404394f
commit bd8a318e88
10 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/xml/date_time_prefs.xml
View File

@@ -52,6 +52,14 @@
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
android:key="location_time_zone_detection"
android:title="@string/location_time_zone_detection_screen_title"
settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"
android:fragment="com.android.settings.datetime.locationtimezone.TimeZoneDetectionSettings"
settings:userRestriction="no_config_date_time"/>
<PreferenceCategory
android:key="time_format_preference_category"
android:title="@string/time_format_category_title"

7
res/xml/location_settings.xml
View File

@@ -65,13 +65,6 @@
settings:forWork="true"
settings:useAdminDisabledSummary="true"/>
<!-- This preference gets removed if location-based time zone detection is not supported -->
<Preference
android:key="location_time_zone_detection"
android:title="@string/location_time_zone_detection_screen_title"
settings:controller="com.android.settings.location.LocationTimeZoneDetectionPreferenceController"
android:fragment="com.android.settings.location.TimeZoneDetectionSettings" />
<PreferenceCategory
android:key="location_services"
android:layout="@layout/preference_category_no_label"

7
res/xml/location_settings_personal.xml
View File

@@ -51,13 +51,6 @@
android:fragment="com.android.settings.location.ScanningSettings"
settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>
<!-- This preference gets removed if location-based time zone detection is not supported -->
<Preference
android:key="location_time_zone_detection"
android:title="@string/location_time_zone_detection_screen_title"
settings:controller="com.android.settings.location.LocationTimeZoneDetectionPreferenceController"
android:fragment="com.android.settings.location.TimeZoneDetectionSettings" />
<PreferenceCategory
android:key="location_services"
android:layout="@layout/preference_category_no_label"

2
res/xml/location_time_zone_detection.xml
View File

@@ -22,7 +22,7 @@
<SwitchPreference
android:title="@string/location_time_zone_detection_enabled_title"
android:summary="@string/location_time_zone_detection_enabled_description"
settings:controller="com.android.settings.location.TimeZoneDetectionTogglePreferenceController"
settings:controller="com.android.settings.datetime.locationtimezone.TimeZoneDetectionTogglePreferenceController"
android:key="location_time_zone_detection_enabled" />
</PreferenceScreen>