Clean up DeviceAdminSetting: make it into DashboardFragment
Change-Id: Ib5634f782daef15ab317175084c6813d6b8a8bb7
Fixes: 110207366
Test: robo
diff --git a/res/xml/device_admin_settings.xml b/res/xml/device_admin_settings.xml
new file mode 100644
index 0000000..999d790
--- /dev/null
+++ b/res/xml/device_admin_settings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:title="@string/manage_device_admin"
+ android:key="device_admin_settings">
+
+ <PreferenceCategory
+ android:key="device_admin_list"
+ android:title="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminListPreferenceController" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index af15c08..8a3d108 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -48,7 +48,7 @@
android:key="fingerprint_settings"
android:title="@string/security_settings_fingerprint_preference_title"
android:summary="@string/summary_placeholder"
- settings:keywords="@string/keywords_fingerprint_settings"/>
+ settings:keywords="@string/keywords_fingerprint_settings" />
</PreferenceCategory>
@@ -75,7 +75,7 @@
android:key="visiblepattern_profile"
android:summary="@string/summary_placeholder"
android:title="@string/lockpattern_settings_enable_visible_pattern_title_profile"
- settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController"/>
+ settings:controller="com.android.settings.security.VisiblePatternProfilePreferenceController" />
<Preference
android:key="fingerprint_settings_profile"
@@ -100,7 +100,7 @@
android:key="show_password"
android:title="@string/show_password"
android:summary="@string/show_password_summary"
- settings:controller="com.android.settings.security.ShowPasswordPreferenceController"/>
+ settings:controller="com.android.settings.security.ShowPasswordPreferenceController" />
</PreferenceCategory>
@@ -112,7 +112,8 @@
android:key="manage_device_admin"
android:title="@string/manage_device_admin"
android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings" />
+ android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings"
+ settings:controller="com.android.settings.enterprise.ManageDeviceAdminPreferenceController" />
<Preference
android:key="enterprise_privacy"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index b7a8e5c..574686a 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -35,7 +35,8 @@
android:key="device_administrators"
android:title="@string/manage_device_admin"
android:fragment="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings"
- settings:controller="com.android.settings.applications.specialaccess.deviceadmin.DeviceAdministratorsController" />
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.enterprise.ManageDeviceAdminPreferenceController" />
<Preference
android:key="system_alert_window"