1 files changed, 1 insertions, 22 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/NumPadKey.java b/packages/Keyguard/src/com/android/keyguard/NumPadKey.java
index 70a4108..681db80 100644
--- a/packages/Keyguard/src/com/android/keyguard/NumPadKey.java
+++ b/packages/Keyguard/src/com/android/keyguard/NumPadKey.java
@@ -22,8 +22,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Debug;
 import android.os.PowerManager;
 import android.os.SystemClock;
-import android.os.UserHandle;
-import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.HapticFeedbackConstants;
 import android.view.KeyEvent;
@@ -120,17 +118,7 @@ public class NumPadKey extends ViewGroup {
         }
 
         setBackground(mContext.getDrawable(R.drawable.ripple_drawable));
-        updateContentDescription();
-    }
-
-    public void updateContentDescription() {
-        if (shouldSpeakPasswordsForAccessibility()) {
-            setContentDescription(
-                    mDigitText.getText().toString() + mKlondikeText.getText().toString());
-        } else {
-            setContentDescription(getContext().getString(
-                    com.android.internal.R.string.keyboard_password_character_no_headset));
-        }
+        setContentDescription(mDigitText.getText().toString());
     }
 
     @Override
@@ -164,15 +152,6 @@ public class NumPadKey extends ViewGroup {
         mKlondikeText.layout(left, top, left + mKlondikeText.getMeasuredWidth(), bottom);
     }
 
-    /**
-     * @return true if the user has explicitly allowed accessibility services
-     * to speak passwords.
-     */
-    private boolean shouldSpeakPasswordsForAccessibility() {
-        return (Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0, UserHandle.USER_CURRENT) == 1);
-    }
-
     @Override
     public boolean hasOverlappingRendering() {
         return false;