Merge "Move device admin viewer/adder to specialaccess package."
This commit is contained in:
@@ -112,7 +112,7 @@
|
||||
android:key="manage_device_admin"
|
||||
android:title="@string/manage_device_admin"
|
||||
android:summary="@string/summary_placeholder"
|
||||
android:fragment="com.android.settings.DeviceAdminSettings" />
|
||||
android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />
|
||||
|
||||
<Preference
|
||||
android:key="enterprise_privacy"
|
||||
|
||||
@@ -34,8 +34,8 @@
|
||||
<Preference
|
||||
android:key="device_administrators"
|
||||
android:title="@string/manage_device_admin"
|
||||
android:fragment="com.android.settings.DeviceAdminSettings"
|
||||
settings:controller="com.android.settings.applications.specialaccess.DeviceAdministratorsController" />
|
||||
android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings"
|
||||
settings:controller="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdministratorsController" />
|
||||
|
||||
<Preference
|
||||
android:key="system_alert_window"
|
||||
|
||||
Reference in New Issue
Block a user