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

Mike Cleron · Android Git Automerger · commit 624ea44120dc · 2012-11-05T17:05:47.000-08:00
* commit 'c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8':
  TextView not respecting "speak passwords" setting when adding before text to events.
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
@@ -8780,8 +8780,8 @@ public void beforeTextChanged(CharSequence buffer, int start,
                     + " before=" + before + " after=" + after + ": " + buffer);
 
             if (AccessibilityManager.getInstance(mContext).isEnabled()
-                    && !isPasswordInputType(getInputType())
-                    && !hasPasswordTransformationMethod()) {
+                    && ((!isPasswordInputType(getInputType()) && !hasPasswordTransformationMethod())
+                            || shouldSpeakPasswordsForAccessibility())) {
                 mBeforeText = buffer.toString();
             }
 

Original file line number	Diff line number	Diff line change
`@@ -8780,8 +8780,8 @@ public void beforeTextChanged(CharSequence buffer, int start,`
`8780`	`8780`	`+ " before=" + before + " after=" + after + ": " + buffer);`
`8781`	`8781`
`8782`	`8782`	`if (AccessibilityManager.getInstance(mContext).isEnabled()`
`8783`		`- && !isPasswordInputType(getInputType())`
`8784`		`- && !hasPasswordTransformationMethod()) {`
	`8783`	`+ && ((!isPasswordInputType(getInputType()) && !hasPasswordTransformationMethod())`
	`8784`	`+ \|\| shouldSpeakPasswordsForAccessibility())) {`
`8785`	`8785`	`mBeforeText = buffer.toString();`
`8786`	`8786`	`}`
`8787`	`8787`