From a68c2f73d632862c90c47719a47438ee578310f1 Mon Sep 17 00:00:00 2001
From: Phil Weaver <pweaver@google.com>
Date: Fri, 10 Feb 2017 16:26:07 -0800
Subject: [PATCH] Remove a11y speak passwords settings.

Bug: 28139568
Test: Opened settings, and it's gone!
Change-Id: Ife931c3a076c9b8470b6cde24712cb9280999bea
---
 res/values/strings.xml                        |  2 --
 res/xml/accessibility_settings.xml            |  5 -----
 .../accessibility/AccessibilitySettings.java  | 21 -------------------
 3 files changed, 28 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 907d1b3bc9d..05d8f8e8320 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4001,8 +4001,6 @@
         screen magnification on app transitions</string>
     <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
     <string name="accessibility_power_button_ends_call_prerefence_title">Power button ends call</string>
-    <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_speak_password_preference_title">Speak passwords</string>
     <!-- Title for the accessibility preference for enabling/disabling large icons for mouse/trackpad pointers. [CHAR LIMIT=35] -->
     <string name="accessibility_toggle_large_pointer_icon_title">Large mouse pointer</string>
     <!-- Title for the accessibility preference for master mono. [CHAR LIMIT=35] -->
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index fb9e171d76d..ee21017e1de 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -66,11 +66,6 @@
                 android:title="@string/accelerometer_title"
                 android:persistent="false"/>
 
-        <SwitchPreference
-                android:key="toggle_speak_password_preference"
-                android:title="@string/accessibility_toggle_speak_password_preference_title"
-                android:persistent="false"/>
-
         <SwitchPreference
                 android:key="toggle_large_pointer_icon"
                 android:title="@string/accessibility_toggle_large_pointer_icon_title" />
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index dc57bddc6ac..807371ea278 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -81,8 +81,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
             "toggle_power_button_ends_call_preference";
     private static final String TOGGLE_LOCK_SCREEN_ROTATION_PREFERENCE =
             "toggle_lock_screen_rotation_preference";
-    private static final String TOGGLE_SPEAK_PASSWORD_PREFERENCE =
-            "toggle_speak_password_preference";
     private static final String TOGGLE_LARGE_POINTER_ICON =
             "toggle_large_pointer_icon";
     private static final String TOGGLE_MASTER_MONO =
@@ -184,7 +182,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
     private SwitchPreference mToggleHighTextContrastPreference;
     private SwitchPreference mTogglePowerButtonEndsCallPreference;
     private SwitchPreference mToggleLockScreenRotationPreference;
-    private SwitchPreference mToggleSpeakPasswordPreference;
     private SwitchPreference mToggleLargePointerIconPreference;
     private SwitchPreference mToggleMasterMonoPreference;
     private ListPreference mSelectLongPressTimeoutPreference;
@@ -334,9 +331,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
         } else if (mToggleLockScreenRotationPreference == preference) {
             handleLockScreenRotationPreferenceClick();
             return true;
-        } else if (mToggleSpeakPasswordPreference == preference) {
-            handleToggleSpeakPasswordPreferenceClick();
-            return true;
         } else if (mToggleLargePointerIconPreference == preference) {
             handleToggleLargePointerIconPreferenceClick();
             return true;
@@ -369,12 +363,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
                 !mToggleLockScreenRotationPreference.isChecked());
     }
 
-    private void handleToggleSpeakPasswordPreferenceClick() {
-        Settings.Secure.putInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD,
-                mToggleSpeakPasswordPreference.isChecked() ? 1 : 0);
-    }
-
     private void handleToggleLargePointerIconPreferenceClick() {
         Settings.Secure.putInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON,
@@ -424,10 +412,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
             mSystemsCategory.removePreference(mToggleLockScreenRotationPreference);
         }
 
-        // Speak passwords.
-        mToggleSpeakPasswordPreference =
-                (SwitchPreference) findPreference(TOGGLE_SPEAK_PASSWORD_PREFERENCE);
-
         // Large pointer icon.
         mToggleLargePointerIconPreference =
                 (SwitchPreference) findPreference(TOGGLE_LARGE_POINTER_ICON);
@@ -606,11 +590,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
         // Auto-rotate screen
         updateLockScreenRotationCheckbox();
 
-        // Speak passwords.
-        final boolean speakPasswordEnabled = Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;
-        mToggleSpeakPasswordPreference.setChecked(speakPasswordEnabled);
-
         // Large pointer icon.
         mToggleLargePointerIconPreference.setChecked(Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, 0) != 0);