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

This commit is contained in:
Zoltan Szatmary-Ban
2015-12-08 10:24:07 +00:00
committed by Android (Google) Code Review
3 changed files with 83 additions and 45 deletions

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"