Merge "Revert "Remove advanced button from location settings""

res/xml/location_settings.xml

@@ -14,8 +14,7 @@
      limitations under the License.
 -->
 
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -25,9 +24,11 @@
             android:key="apps_dashboard"
             android:layout="@layout/app_entities_header"
             android:selectable="false"
-        settings:allowDividerBelow="true"/>
+            settings:allowDividerBelow="true" />
 
-    <PreferenceCategory android:key="location_advanced_settings">
+        <PreferenceCategory
+            android:key="location_advanced_settings"
+            settings:initialExpandedChildrenCount="2">
 
             <!-- This preference category gets removed if new_recent_location_ui is disabled -->
             <Preference
@@ -35,7 +36,7 @@
                 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"/>
+                           android:value="android.permission-group.LOCATION" />
                 </intent>
             </Preference>
 
@@ -50,10 +51,10 @@
                 android:title="@string/managed_profile_location_switch_title"
                 settings:useAdminDisabledSummary="true"
                 android:enabled="false"
-            android:selectable="true"/>
+                android:selectable="true" />
 
             <PreferenceCategory
-            android:key="location_services"/>
+                android:key="location_services" />
         </PreferenceCategory>
 
         <PreferenceCategory