summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaph Levien <raph@google.com>2013-05-15 17:44:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-05-15 17:44:16 +0000
commit214038571992a4ba65531297bf4a89af9a0b5fd4 (patch)
tree06f6e097877023651360683b6c805df19ab1b554
parent5f46f16e040163bb5fe9ed841a3d11312d10af01 (diff)
parent01524651cb8f7b97a310bd262f4c792e860e140f (diff)
downloadframeworks_base-214038571992a4ba65531297bf4a89af9a0b5fd4.zip
frameworks_base-214038571992a4ba65531297bf4a89af9a0b5fd4.tar.gz
frameworks_base-214038571992a4ba65531297bf4a89af9a0b5fd4.tar.bz2
Merge "Fix for bug 8911390 RTL text alignment is changed ..." into jb-mr2-dev
-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);