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

Merge "Untab Location Settings and tab Location Services" into sc-dev am: 60ddf8d7d4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13985188

Change-Id: Icd9ff01202d4fd4135b79f03eb5df5a9c1cc04b1
This commit is contained in:
Yu-Han Yang
2021-03-30 17:10:11 +00:00
committed by Automerger Merge Worker
parent d822c05cdf 60ddf8d7d4
commit 6b7ae6b75e
4 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
res/xml/location_settings.xml
View File

@@ -38,7 +38,17 @@
<PreferenceCategory
android:key="location_advanced_settings"
android:layout="@layout/preference_category_no_label"
settings:initialExpandedChildrenCount="2">
settings:initialExpandedChildrenCount="3">
<!-- This preference gets removed if there is no managed profile -->
<com.android.settingslib.RestrictedSwitchPreference
android:enabled="false"
android:key="managed_profile_location_switch"
android:selectable="true"
android:title="@string/managed_profile_location_switch_title"
settings:controller="com.android.settings.location.LocationForWorkPreferenceController"
settings:forWork="true"
settings:useAdminDisabledSummary="true"/>
<!-- This preference category gets removed if new_recent_location_ui is disabled -->
<Preference
@@ -57,23 +67,6 @@
android:title="@string/location_services_screen_title"
settings:controller="com.android.settings.location.LocationServicesPreferenceController"/>
<!-- This preference gets removed if there is no managed profile -->
<com.android.settingslib.RestrictedSwitchPreference
android:enabled="false"
android:key="managed_profile_location_switch"
android:selectable="true"
android:title="@string/managed_profile_location_switch_title"
settings:controller="com.android.settings.location.LocationForWorkPreferenceController"
settings:forWork="true"
settings:useAdminDisabledSummary="true"/>
<!-- This preference gets removed if there is no managed profile -->
<PreferenceCategory
android:key="location_services_managed_profile"
android:title="@string/managed_profile_location_services"
settings:forWork="true"
settings:controller="com.android.settings.location.LocationInjectedServicesForWorkPreferenceController"/>
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference