From 7b235e3cfe9c720c427571fa213751cc2e06116b Mon Sep 17 00:00:00 2001
From: tmfang <tmfang@google.com>
Date: Wed, 7 Nov 2018 12:06:34 +0800
Subject: [PATCH] Remove "Show password" in Security page

"Show password" will be moved in Settings > Privacy.
Since each of things should only exist in one place,
we remove it in Security page.

Test: visual
Bug: 116628158
Change-Id: I9f9083b88d7a20faa9bd28ded2cf8c3b9a5622fd
---
 res/xml/security_dashboard_settings.xml            | 14 --------------
 .../settings/security/SecuritySettings.java        |  1 -
 2 files changed, 15 deletions(-)

diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index ce271cc4752..38bc2d0d716 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -89,20 +89,6 @@
 
     </PreferenceCategory>
 
-    <!-- security_settings_misc.xml -->
-    <PreferenceCategory
-        android:order="30"
-        android:key="security_settings_misc_category"
-        android:title="@string/security_passwords_title">
-
-        <SwitchPreference
-            android:key="show_password"
-            android:title="@string/show_password"
-            android:summary="@string/show_password_summary"
-            settings:controller="com.android.settings.security.ShowPasswordPreferenceController" />
-
-    </PreferenceCategory>
-
     <PreferenceCategory
         android:order="40"
         android:key="security_settings_device_admin_category">
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
index e00d3878890..aa347c8ab6b 100644
--- a/src/com/android/settings/security/SecuritySettings.java
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -108,7 +108,6 @@ public class SecuritySettings extends DashboardFragment {
         controllers.add(new ManageTrustAgentsPreferenceController(context));
         controllers.add(new ScreenPinningPreferenceController(context));
         controllers.add(new SimLockPreferenceController(context));
-        controllers.add(new ShowPasswordPreferenceController(context));
         controllers.add(new EncryptionStatusPreferenceController(context,
                 PREF_KEY_ENCRYPTION_SECURITY_PAGE));
         controllers.add(new TrustAgentListPreferenceController(context, host, lifecycle));