summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-05-19 23:56:06 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-19 23:56:06 +0000
commitd6a91b0bb64b17dcf4ae635f428dfd4ad310f73e (patch)
tree9c6acb8dba0e5a61ec43d53c8e9e52cc322aa600 /core/java/android
parentc135fffe99ef53849cafcd6ca9f08edadb599559 (diff)
parent3a499e013ce1dfa6b90e222e030fab03333fb016 (diff)
downloadframeworks_base-d6a91b0bb64b17dcf4ae635f428dfd4ad310f73e.zip
frameworks_base-d6a91b0bb64b17dcf4ae635f428dfd4ad310f73e.tar.gz
frameworks_base-d6a91b0bb64b17dcf4ae635f428dfd4ad310f73e.tar.bz2
Merge "Fix password obscuring in TextView accessibility node"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/widget/TextView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 8f073de..a4a9680 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8194,7 +8194,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
final boolean isPassword = hasPasswordTransformationMethod();
info.setPassword(isPassword);
- if (!isPassword) {
+ if (!isPassword || shouldSpeakPasswordsForAccessibility()) {
info.setText(getTextForAccessibility());
}