PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-28 00:38:18 +00:00
committed by Android (Google) Code Review
parent 15b6fbdc71 7771fa5a95
commit 08dba1720e
1 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/xml/location_settings.xml
View File

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