diff options
| author | Raph Levien <raph@google.com> | 2013-05-15 13:35:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 13:35:06 -0700 |
| commit | 38272ad2b1d3ab90c83fcd74139503fcd3148a19 (patch) | |
| tree | f35d90d41c83a557822f0e138b3b086cc1bce6c5 /core/java/android | |
| parent | 231544c9212b31699f2bd8ef02c02f668e1c786e (diff) | |
| parent | 214038571992a4ba65531297bf4a89af9a0b5fd4 (diff) | |
| download | frameworks_base-38272ad2b1d3ab90c83fcd74139503fcd3148a19.zip frameworks_base-38272ad2b1d3ab90c83fcd74139503fcd3148a19.tar.gz frameworks_base-38272ad2b1d3ab90c83fcd74139503fcd3148a19.tar.bz2 | |
am 21403857: Merge "Fix for bug 8911390 RTL text alignment is changed ..." into jb-mr2-dev
* commit '214038571992a4ba65531297bf4a89af9a0b5fd4':
Fix for bug 8911390 RTL text alignment is changed ...
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/text/method/Touch.java | 4 |
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); |