From 6f2741d50b73de923ebd0e6aa4e2f6fe32dee215 Mon Sep 17 00:00:00 2001
From: Maggie <yiranwang@google.com>
Date: Thu, 15 Mar 2018 12:10:18 -0700
Subject: [PATCH] Add an Advanced button to location settings

Add an Advanced button under "recent location requests" and "app level
permissions" in location settings.
Location footer should still be visible under Advanced button.

Bug: 70350519
Test: Manual
Change-Id: I5db32e911ed6527048c625f691f5476eb77751b3
---
 res/xml/location_settings.xml | 56 +++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index d616bb69f6e..22079bfce8a 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -31,33 +31,37 @@
             android:selectable="true"
             android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"/>
 
-        <!-- 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"
-            settings:allowDividerAbove="true">
-            <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"
-            android:title="@string/location_category_location_services"/>
+            android:key="location_advanced_settings"
+            settings:initialExpandedChildrenCount="1">
+
+            <!-- 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"
+                android:title="@string/location_category_location_services"/>
+        </PreferenceCategory>
 
         <PreferenceCategory
             android:key="location_footer"