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

Merge "Add UI to Settings > Location for Managed Profile Location Control"

Browse Source
This commit is contained in:
Zoltan Szatmary-Ban
2015-12-08 10:24:07 +00:00
committed by Android (Google) Code Review
parent 5518adbe1a ad0ca96fcd
commit 70b49b1b70
3 changed files with 83 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -2783,8 +2783,6 @@
<!-- Security & location settings screen, section header for settings relating to location -->
<string name="location_title">My Location</string>
<!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
<string name="managed_profile_location_category">Work profile</string>
<!-- [CHAR LIMIT=30] Title for managed profile location switch -->
<string name="managed_profile_location_switch_title">Location for work profile</string>
<!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->

20
res/xml/location_settings.xml
View File

@@ -27,19 +27,13 @@
android:summary="@string/location_mode_location_off_title" />
<!-- This preference category gets removed if there is no managed profile -->
<PreferenceCategory
android:key="managed_profile_location_category"
android:title="@string/managed_profile_location_category">
<Preference
android:key="managed_profile_location_switch"
android:title="@string/managed_profile_location_switch_title"
android:summary="@string/managed_profile_location_switch_lockdown"
android:persistent="false"
android:enabled="false"
android:selectable="false" />
</PreferenceCategory>
<SwitchPreference
android:key="managed_profile_location_switch"
android:title="@string/managed_profile_location_switch_title"
android:summary="@string/managed_profile_location_switch_lockdown"
android:persistent="false"
android:enabled="false"
android:selectable="true" />
<PreferenceCategory
android:key="recent_location_requests"