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

am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev

Browse Source 
automerge: 45f0423

* commit '45f04233c22231d3216ceb9a1a7cc5b09cf45401':
  Make Location Settings multiprofile aware
This commit is contained in:
Zoltan Szatmary-Ban
2014-12-09 23:15:46 +00:00
committed by android-build-merger
parent a62e42be14 45f04233c2
commit 77d7e17fba
6 changed files with 207 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/xml/location_settings.xml
View File

@@ -26,6 +26,21 @@
settings:keywords="@string/keywords_location_mode"
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>
<PreferenceCategory
android:key="recent_location_requests"
android:title="@string/location_category_recent_location_requests" />