Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-10-03 17:43:08 -07:00
committed by Android (Google) Code Review
parent 55941e3e95 db24f0a73f
commit 33c36895a2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/text/Layout.java
View File

@@ -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