diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2012-10-03 17:43:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 17:43:08 -0700 |
| commit | 33c36895a294c7b731fd59017a7ea0f06ac2a356 (patch) | |
| tree | ddea5958c727f19c5b45daf0bd1af615b185151d | |
| parent | 55941e3e953c3007c46d554c7a4f018043894980 (diff) | |
| parent | db24f0a73f4385aea104367a4bc71b78f25dbc3f (diff) | |
| download | frameworks_base-33c36895a294c7b731fd59017a7ea0f06ac2a356.zip frameworks_base-33c36895a294c7b731fd59017a7ea0f06ac2a356.tar.gz frameworks_base-33c36895a294c7b731fd59017a7ea0f06ac2a356.tar.bz2 | |
Merge "Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT" into jb-mr1-dev
| -rw-r--r-- | core/java/android/text/Layout.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/java/android/text/Layout.java b/core/java/android/text/Layout.java index d2bed48..123acca 100644 --- a/core/java/android/text/Layout.java +++ b/core/java/android/text/Layout.java @@ -475,10 +475,14 @@ public abstract class Layout { Alignment align = getParagraphAlignment(line); int dir = getParagraphDirection(line); - int x; if (align == Alignment.ALIGN_LEFT) { - x = left; - } else if (align == Alignment.ALIGN_NORMAL) { + align = (dir == DIR_LEFT_TO_RIGHT) ? Alignment.ALIGN_NORMAL : Alignment.ALIGN_OPPOSITE; + } else if (align == Alignment.ALIGN_RIGHT) { + align = (dir == DIR_LEFT_TO_RIGHT) ? Alignment.ALIGN_OPPOSITE : Alignment.ALIGN_NORMAL; + } + + int x; + if (align == Alignment.ALIGN_NORMAL) { if (dir == DIR_LEFT_TO_RIGHT) { x = left; } else { @@ -498,12 +502,11 @@ public abstract class Layout { } } int max = (int)getLineExtent(line, tabStops, false); - if (align == Alignment.ALIGN_RIGHT) { - x = right - max; - } else if (align == Alignment.ALIGN_OPPOSITE) { + if (align == Alignment.ALIGN_OPPOSITE) { if (dir == DIR_LEFT_TO_RIGHT) { x = right - max; } else { + // max is negative here x = left - max; } } else { // Alignment.ALIGN_CENTER |