Merge "Changes to location settings for geotz"

res/xml/location_settings.xml

@@ -65,6 +65,13 @@
             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"

res/xml/location_settings_personal.xml

@@ -51,6 +51,13 @@
         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"

res/xml/location_time_zone_detection.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/location_time_zone_detection_screen_title">
+
+    <SwitchPreference
+        android:title="@string/location_time_zone_detection_enabled_title"
+        android:summary="@string/location_time_zone_detection_enabled_description"
+        android:key="location_time_zone_detection_enabled" />
+
+</PreferenceScreen>