From 479f32e0edc69d96ba50f8ed53798a6ec8c8a7f2 Mon Sep 17 00:00:00 2001
From: Bartosz Fabianowski <bartfab@google.com>
Date: Mon, 20 Mar 2017 19:10:02 +0100
Subject: [PATCH] Remove "Device administration" heading

This heading was meant to go away in the new IA.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I842673b01f62c2eb5eb51837d2c3d92829ac0ca0
---
 res/values/strings.xml                         | 3 ---
 res/xml/security_settings_misc.xml             | 4 +---
 src/com/android/settings/SecuritySettings.java | 5 -----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4a85b8feec1..7ed24642ac6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1300,9 +1300,6 @@
     <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
     <string name="lock_setup" msgid="5507462851158901718">Setup is complete.</string>
 
-    <!-- In the security screen, the header title for settings related to device admins -->
-    <string name="device_admin_title">Device administration</string>
-
     <!-- Title of preference to manage device admins -->
     <string name="manage_device_admin">Device admin apps</string>
 
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index e058b3ea8fe..943f04cc99f 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -33,9 +33,7 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:key="device_admin_category"
-            android:title="@string/device_admin_title"
-            android:persistent="false">
+    <PreferenceCategory>
 
         <Preference android:key="manage_device_admin"
                 android:title="@string/manage_device_admin"
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index edefaf712a0..1cb763b633c 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -102,7 +102,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private static final String KEY_UNLOCK_SET_OR_CHANGE_PROFILE = "unlock_set_or_change_profile";
     private static final String KEY_VISIBLE_PATTERN_PROFILE = "visiblepattern_profile";
     private static final String KEY_SECURITY_CATEGORY = "security_category";
-    private static final String KEY_DEVICE_ADMIN_CATEGORY = "device_admin_category";
     private static final String KEY_MANAGE_TRUST_AGENTS = "manage_trust_agents";
     private static final String KEY_UNIFICATION = "unification";
 
@@ -351,10 +350,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         // Credential storage
         final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
 
-        // Application install
-        PreferenceGroup deviceAdminCategory = (PreferenceGroup)
-                root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
-
         // Advanced Security features
         Preference manageAgents = root.findPreference(KEY_MANAGE_TRUST_AGENTS);
         if (manageAgents != null && !mLockPatternUtils.isSecure(MY_USER_ID)) {