commit 7eea0f18b4da7c363a92d382d87222f31763f1b1
author Amith Yamasani <yamasani@google.com> Tue Nov 16 16:47:40 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 16 16:47:40 2010 -0800
tree 87041c9b577a9614957958c85e2efde1855f832f
parent 9b756acfbd55b901e37766b034e7af3ad08dc757
parent 1d1e1105ad2497ba51930b75eea0a5e819044b43

Merge "3049240 TalkBack on Accessibility Options reads out passwords entered in during Lock screen"

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index fbc8549..aefe8d8 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -6720,7 +6720,8 @@
                     + " before=" + before + " after=" + after + ": " + buffer);
 
             if (AccessibilityManager.getInstance(mContext).isEnabled()
-                    && !isPasswordInputType(mInputType)) {
+                    && !isPasswordInputType(mInputType)
+                    && !hasPasswordTransformationMethod()) {
                 mBeforeText = buffer.toString();
             }
 
@@ -7599,7 +7600,7 @@
             return false;
         }
 
-        final boolean isPassword = isPasswordInputType(mInputType);
+        final boolean isPassword = hasPasswordTransformationMethod();
 
         if (!isPassword) {
             CharSequence text = getText();