Merge "Add an Advanced button to location settings" into pi-dev

am: ff912223b7

Change-Id: Iaa51d5f9c3e2e4785183f667b47391a652089d60
This commit is contained in:
Maggie Wang
2018-03-20 23:28:01 +00:00
committed by android-build-merger

View File

@@ -31,11 +31,14 @@
android:selectable="true" android:selectable="true"
android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"/> android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"/>
<PreferenceCategory
android:key="location_advanced_settings"
settings:initialExpandedChildrenCount="1">
<!-- This preference category gets removed if new_recent_location_ui is disabled --> <!-- This preference category gets removed if new_recent_location_ui is disabled -->
<Preference <Preference
android:key="app_level_permissions" android:key="app_level_permissions"
android:title="@string/location_app_level_permissions" android:title="@string/location_app_level_permissions">
settings:allowDividerAbove="true">
<intent android:action="android.intent.action.MANAGE_PERMISSION_APPS"> <intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">
<extra android:name="android.intent.extra.PERMISSION_NAME" <extra android:name="android.intent.extra.PERMISSION_NAME"
android:value="android.permission-group.LOCATION" /> android:value="android.permission-group.LOCATION" />
@@ -58,6 +61,7 @@
<PreferenceCategory <PreferenceCategory
android:key="location_services" android:key="location_services"
android:title="@string/location_category_location_services"/> android:title="@string/location_category_location_services"/>
</PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="location_footer" android:key="location_footer"