summaryrefslogtreecommitdiff
path: root/core/java/android/widget
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2011-08-26 14:05:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-26 14:05:09 -0700
commitd32f27aec04dd91edf488f280ca609e0b55aec9e (patch)
tree767de42d61cf96032c867073d72d0e7dfb6a3b1c /core/java/android/widget
parent2589c93733cef18a7f7502dd5830baa0a02423a7 (diff)
parent7810b5f8cffb3c2c98fd0df579f4da5a9ac6cc73 (diff)
Merge "Fix bug #5199577 TextView with android:password="true" is showing the "dots" on the left even if the password chars are RTL"
Diffstat (limited to 'core/java/android/widget')
-rw-r--r--core/java/android/widget/TextView.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index c92b5f9f5bb3..c021c486d431 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -10886,6 +10886,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
@Override
protected void resolveTextDirection() {
+ if (hasPasswordTransformationMethod()) {
+ mTextDir = TextDirectionHeuristics.LOCALE;
+ return;
+ }
+
// Always need to resolve layout direction first
final boolean defaultIsRtl = (getResolvedLayoutDirection() == LAYOUT_DIRECTION_RTL);