From ac584f2911674822114e49fba9f2dc74e01485e2 Mon Sep 17 00:00:00 2001
From: Almaz Mingaleev <mingaleev@google.com>
Date: Thu, 29 Apr 2021 16:48:58 +0000
Subject: [PATCH] Place GeoTZ toggle under auto time zone toggle.

This moves the two toggles that control the time zone detection
behavior next to each other, rather than having them either side
of the current device time zone. This is intended to making it
clear they are both influencing detection behavior. It will ensure
that future text we put under the auto time zone toggle for the
tablet use case (where there is no telephony detection) explaining
that "Use location to set time zone" has to be on will be right
next to the toggle that needs to change.

Bug: 152746236
Bug: 186625820
Test: flashed device, checked manually
Change-Id: Ifd43db3d5cc7e764b12f8da20e552b1a5479ac4a
---
 res/xml/date_time_prefs.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 27311322e28..a0801f9df1b 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -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