From 7771fa5a95ed1b91f9a5ffef80cb30c4edb0c064 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Wed, 27 Mar 2019 23:15:32 +0000
Subject: [PATCH] Revert "Remove advanced button from location settings"

This reverts commit c7cef5ee43f0678998216bb2bc77c1cd9382cc2b.

Reason for revert: b/124059127

Change-Id: I34e788f6959b94f27b4e25f1ca925777acb9a1d0
---
 res/xml/location_settings.xml | 83 ++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 7eccd23a5ee..29d4048c22f 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -14,49 +14,50 @@
      limitations under the License.
 -->
 
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="location_settings"
-    android:title="@string/location_settings_title"
-    settings:keywords="@string/keywords_location">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:key="location_settings"
+        android:title="@string/location_settings_title"
+        settings:keywords="@string/keywords_location">
 
-    <com.android.settingslib.widget.LayoutPreference
-        android:key="apps_dashboard"
-        android:layout="@layout/app_entities_header"
-        android:selectable="false"
-        settings:allowDividerBelow="true"/>
-
-    <PreferenceCategory android:key="location_advanced_settings">
-
-        <!-- This preference category gets removed if new_recent_location_ui is disabled -->
-        <Preference
-            android:key="app_level_permissions"
-            android:title="@string/location_app_level_permissions">
-            <intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">
-                <extra android:name="android.intent.extra.PERMISSION_NAME"
-                       android:value="android.permission-group.LOCATION"/>
-            </intent>
-        </Preference>
-
-        <Preference
-            android:key="location_scanning"
-            android:title="@string/location_scanning_screen_title"
-            android:fragment="com.android.settings.location.ScanningSettings"/>
-
-        <!-- This preference gets removed if there is no managed profile -->
-        <com.android.settingslib.RestrictedSwitchPreference
-            android:key="managed_profile_location_switch"
-            android:title="@string/managed_profile_location_switch_title"
-            settings:useAdminDisabledSummary="true"
-            android:enabled="false"
-            android:selectable="true"/>
+        <com.android.settingslib.widget.LayoutPreference
+            android:key="apps_dashboard"
+            android:layout="@layout/app_entities_header"
+            android:selectable="false"
+            settings:allowDividerBelow="true" />
 
         <PreferenceCategory
-            android:key="location_services"/>
-    </PreferenceCategory>
+            android:key="location_advanced_settings"
+            settings:initialExpandedChildrenCount="2">
 
-    <PreferenceCategory
-        android:key="location_footer"
-        settings:allowDividerAbove="false"/>
+            <!-- This preference category gets removed if new_recent_location_ui is disabled -->
+            <Preference
+                android:key="app_level_permissions"
+                android:title="@string/location_app_level_permissions">
+                <intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">
+                    <extra android:name="android.intent.extra.PERMISSION_NAME"
+                           android:value="android.permission-group.LOCATION" />
+                </intent>
+            </Preference>
+
+            <Preference
+                android:key="location_scanning"
+                android:title="@string/location_scanning_screen_title"
+                android:fragment="com.android.settings.location.ScanningSettings"/>
+
+            <!-- This preference gets removed if there is no managed profile -->
+            <com.android.settingslib.RestrictedSwitchPreference
+                android:key="managed_profile_location_switch"
+                android:title="@string/managed_profile_location_switch_title"
+                settings:useAdminDisabledSummary="true"
+                android:enabled="false"
+                android:selectable="true" />
+
+            <PreferenceCategory
+                android:key="location_services" />
+        </PreferenceCategory>
+
+        <PreferenceCategory
+            android:key="location_footer"
+            settings:allowDividerAbove="false"/>
 </PreferenceScreen>