am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev

* commit 'c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8': TextView not respecting "speak passwords" setting when adding before text to events.
2012-11-05 17:05:47 -08:00
parent 06da337876 c87f198b8c
commit 624ea44120
1 changed files with 2 additions and 2 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8780,8 +8780,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                    + " before=" + before + " after=" + after + ": " + buffer);
            if (AccessibilityManager.getInstance(mContext).isEnabled()
-                    && !isPasswordInputType(getInputType())
+                    && ((!isPasswordInputType(getInputType()) && !hasPasswordTransformationMethod())
-                    && !hasPasswordTransformationMethod()) {
+                            || shouldSpeakPasswordsForAccessibility())) {
                mBeforeText = buffer.toString();
            }