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

resolve merge conflicts of 957bdc56c5 to master.

Browse Source 
Change-Id: I4c8749f92a1fa39bf0d08e10155d9e68c87401c0
This commit is contained in:
Raph Levien
2016-01-12 17:45:34 -08:00
parent 477e26cf93 957bdc56c5
commit e53e428a7e
1 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1116,24 +1116,30 @@ public abstract class Layout {
public int getOffsetForHorizontal(int line, float horiz) {
// TODO: use Paint.getOffsetForAdvance to avoid binary search
final int lineEndOffset = getLineEnd(line);
final int lineStartOffset = getLineStart(line);
Directions dirs = getLineDirections(line);
TextLine tl = TextLine.obtain();
// XXX: we don't care about tabs as we just use TextLine#getOffsetToLeftRightOf here.
tl.set(mPaint, mText, lineStartOffset, lineEndOffset, getParagraphDirection(line), dirs,
false, null);
final int max;
if (line == getLineCount() - 1) {
max = lineEndOffset;
} else {
max = mPaint.getTextRunCursor(mText, 0, mText.length(),
isRtlCharAt(lineEndOffset) ? Paint.DIRECTION_RTL : Paint.DIRECTION_LTR,
lineEndOffset, Paint.CURSOR_BEFORE);
max = tl.getOffsetToLeftRightOf(lineEndOffset - lineStartOffset,
!isRtlCharAt(lineEndOffset - 1)) + lineStartOffset;
}
final int min = getLineStart(line);
Directions dirs = getLineDirections(line);
int best = min;
int best = lineStartOffset;
float bestdist = Math.abs(getPrimaryHorizontal(best) - horiz);
for (int i = 0; i < dirs.mDirections.length; i += 2) {
int here = min + dirs.mDirections[i];
int here = lineStartOffset + dirs.mDirections[i];
int there = here + (dirs.mDirections[i+1] & RUN_LENGTH_MASK);
int swap = (dirs.mDirections[i+1] & RUN_RTL_FLAG) != 0 ? -1 : 1;
boolean isRtl = (dirs.mDirections[i+1] & RUN_RTL_FLAG) != 0;
int swap = isRtl ? -1 : 1;
if (there > max)
there = max;
@@ -1153,23 +1159,23 @@ public abstract class Layout {
low = here + 1;
if (low < there) {
low = getOffsetAtStartOf(low);
int aft = tl.getOffsetToLeftRightOf(low - lineStartOffset, isRtl) + lineStartOffset;
low = tl.getOffsetToLeftRightOf(aft - lineStartOffset, !isRtl) + lineStartOffset;
if (low >= here && low < there) {
float dist = Math.abs(getPrimaryHorizontal(low) - horiz);
if (aft < there) {
float other = Math.abs(getPrimaryHorizontal(aft) - horiz);
float dist = Math.abs(getPrimaryHorizontal(low) - horiz);
int aft = TextUtils.getOffsetAfter(mText, low);
if (aft < there) {
float other = Math.abs(getPrimaryHorizontal(aft) - horiz);
if (other < dist) {
dist = other;
low = aft;
if (other < dist) {
dist = other;
low = aft;
}
}
}
if (dist < bestdist) {
bestdist = dist;
best = low;
if (dist < bestdist) {
bestdist = dist;
best = low;
}
}
}
@@ -1188,6 +1194,7 @@ public abstract class Layout {
best = max;
}
TextLine.recycle(tl);
return best;
}