summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2013-05-14 14:00:07 -0700
committerRaph Levien <raph@google.com>2013-05-14 14:00:07 -0700
commit01524651cb8f7b97a310bd262f4c792e860e140f (patch)
tree933a33b1ddfdbe5bc321c811f165302af303f7ef
parentb3c2b21b5ba30d82938ae2ef93d8120f5fd0cc80 (diff)
downloadframeworks_base-01524651cb8f7b97a310bd262f4c792e860e140f.zip
frameworks_base-01524651cb8f7b97a310bd262f4c792e860e140f.tar.gz
frameworks_base-01524651cb8f7b97a310bd262f4c792e860e140f.tar.bz2
Fix for bug 8911390 RTL text alignment is changed ...
The predicate for detecting whether text was right aligned was missing some cases - it was correctly sensing RIGHT or OPPOSITE aligned text in the LTR case, but was missing NORMAL for rtl. This patch just adds that case. Change-Id: I06691e7122e1ca91d66299cf0d7ef1f8a476a44b
-rw-r--r--core/java/android/text/method/Touch.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/text/method/Touch.java b/core/java/android/text/method/Touch.java
index 3dfd44d..9394a0b 100644
--- a/core/java/android/text/method/Touch.java
+++ b/core/java/android/text/method/Touch.java
@@ -64,7 +64,9 @@ public class Touch {
if (actualWidth < availableWidth) {
if (a == Alignment.ALIGN_CENTER) {
x = left - ((availableWidth - actualWidth) / 2);
- } else if ((ltr && (a == Alignment.ALIGN_OPPOSITE)) || (a == Alignment.ALIGN_RIGHT)) {
+ } else if ((ltr && (a == Alignment.ALIGN_OPPOSITE)) ||
+ (!ltr && (a == Alignment.ALIGN_NORMAL)) ||
+ (a == Alignment.ALIGN_RIGHT)) {
// align_opposite does NOT mean align_right, we need the paragraph
// direction to resolve it to left or right
x = left - (availableWidth - actualWidth);