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.
This commit is contained in:
Mike Cleron
2012-11-05 17:06:21 -08:00
committed by Android Git Automerger

View File

@@ -8780,8 +8780,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
+ " before=" + before + " after=" + after + ": " + buffer);
if (AccessibilityManager.getInstance(mContext).isEnabled()
&& !isPasswordInputType(getInputType())
&& !hasPasswordTransformationMethod()) {
&& ((!isPasswordInputType(getInputType()) && !hasPasswordTransformationMethod())
|| shouldSpeakPasswordsForAccessibility())) {
mBeforeText = buffer.toString();
}