diff options
| author | Mike Cleron <mcleron@google.com> | 2012-11-05 17:03:06 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-05 17:03:06 -0800 |
| commit | c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8 (patch) | |
| tree | 535e3400af304c0533d5d25ecd63ab5758f2c911 /core/java | |
| parent | 6c642089bcd13bf17d7c445b2ec89b62a79c9823 (diff) | |
| parent | 72bba588079e17eb425c4926d22ffcf301693bab (diff) | |
| download | frameworks_base-c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8.zip frameworks_base-c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8.tar.gz frameworks_base-c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8.tar.bz2 | |
Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a46481c..5d90400 100644 --- 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()) - && !hasPasswordTransformationMethod()) { + && ((!isPasswordInputType(getInputType()) && !hasPasswordTransformationMethod()) + || shouldSpeakPasswordsForAccessibility())) { mBeforeText = buffer.toString(); } |