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

Merge "Add support for showing the admin disabling settings."

Browse Source
This commit is contained in:
Kenny Guy
2015-12-14 14:31:37 +00:00
committed by Android (Google) Code Review
parent e88f94b6df 9159fe9af8
commit 4f3b09d2b5
14 changed files with 595 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/privacy_settings.xml
View File

@@ -54,10 +54,11 @@
android:fragment="com.android.settings.ResetNetwork" />
<!-- Factory reset -->
<PreferenceScreen
<com.android.settings.RestrictedPreference
android:key="factory_reset"
android:title="@string/master_clear_title"
settings:keywords="@string/keywords_factory_data_reset"
settings:userRestriction="no_factory_reset"
android:fragment="com.android.settings.MasterClear" />
</PreferenceScreen>

2
res/xml/security_settings_misc.xml
View File

@@ -52,7 +52,7 @@
android:persistent="false"
android:fragment="com.android.settings.DeviceAdminSettings"/>
<SwitchPreference android:key="toggle_install_applications"
<com.android.settings.RestrictedSwitchPreference android:key="toggle_install_applications"
android:title="@string/install_applications"
android:summaryOff="@string/install_unknown_applications"
android:summaryOn="@string/install_unknown_applications"