Merge "Fix for bug 8911390 RTL text alignment is changed ..." into jb-mr2-dev

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 3dfd44d90e4d..9394a0bae6a5 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);