Merge "Add Content Protection settings to Advanced Security page" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
245df05c33
@@ -30,6 +30,15 @@
|
|||||||
android:key="security_category"
|
android:key="security_category"
|
||||||
android:layout="@layout/preference_category_no_label" />
|
android:layout="@layout/preference_category_no_label" />
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:order="230"
|
||||||
|
android:key="content_protection_preference"
|
||||||
|
android:title="@string/content_protection_preference_title"
|
||||||
|
android:summary="@string/content_protection_preference_summary"
|
||||||
|
android:fragment="com.android.settings.security.ContentProtectionPreferenceFragment"
|
||||||
|
settings:keywords="@string/content_protection_preference_title"
|
||||||
|
settings:controller="com.android.settings.security.ContentProtectionPreferenceController" />
|
||||||
|
|
||||||
<PreferenceCategory
|
<PreferenceCategory
|
||||||
android:order="240"
|
android:order="240"
|
||||||
android:key="security_settings_device_admin_category"
|
android:key="security_settings_device_admin_category"
|
||||||
|
Reference in New Issue
Block a user