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

am 636a0da8: Merge "Fix: A part of grapheme cluster can be selected." into mnc-dev

Browse Source 
* commit '636a0da80533eff7fa8b67afb07277b0ba065d7c':
  Fix: A part of grapheme cluster can be selected.
This commit is contained in:
Keisuke Kuroyanagi
2015-05-07 21:41:08 +00:00
committed by Android Git Automerger
parent 51f3b19c81 636a0da805
commit 089dd0cbc4
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/java/android/widget/Editor.java
View File

@@ -788,7 +788,7 @@ public class Editor {
if (selectionStart == BreakIterator.DONE || selectionEnd == BreakIterator.DONE || if (selectionStart == BreakIterator.DONE || selectionEnd == BreakIterator.DONE ||
selectionStart == selectionEnd) { selectionStart == selectionEnd) {
// Possible when the word iterator does not properly handle the text's language // Possible when the word iterator does not properly handle the text's language
long range = getCharRange(minOffset); long range = getCharClusterRange(minOffset);
selectionStart = TextUtils.unpackRangeStartFromLong(range); selectionStart = TextUtils.unpackRangeStartFromLong(range);
selectionEnd = TextUtils.unpackRangeEndFromLong(range); selectionEnd = TextUtils.unpackRangeEndFromLong(range);
} }
@@ -831,29 +831,25 @@ public class Editor {
return mWordIteratorWithText; return mWordIteratorWithText;
} }
private long getCharRange(int offset) { private int getNextCursorOffset(int offset, boolean findAfterGivenOffset) {
final Layout layout = mTextView.getLayout();
if (layout == null) return offset;
final CharSequence text = mTextView.getText();
final int nextOffset = layout.getPaint().getTextRunCursor(text, 0, text.length(),
layout.isRtlCharAt(offset) ? Paint.DIRECTION_RTL : Paint.DIRECTION_LTR,
offset, findAfterGivenOffset ? Paint.CURSOR_AFTER : Paint.CURSOR_BEFORE);
return nextOffset == -1 ? offset : nextOffset;
}
private long getCharClusterRange(int offset) {
final int textLength = mTextView.getText().length(); final int textLength = mTextView.getText().length();
if (offset + 1 < textLength) {
final char currentChar = mTextView.getText().charAt(offset);
final char nextChar = mTextView.getText().charAt(offset + 1);
if (Character.isSurrogatePair(currentChar, nextChar)) {
return TextUtils.packRangeInLong(offset, offset + 2);
}
}
if (offset < textLength) { if (offset < textLength) {
return TextUtils.packRangeInLong(offset, offset + 1); return TextUtils.packRangeInLong(offset, getNextCursorOffset(offset, true));
}
if (offset - 2 >= 0) {
final char previousChar = mTextView.getText().charAt(offset - 1);
final char previousPreviousChar = mTextView.getText().charAt(offset - 2);
if (Character.isSurrogatePair(previousPreviousChar, previousChar)) {
return TextUtils.packRangeInLong(offset - 2, offset);
}
} }
if (offset - 1 >= 0) { if (offset - 1 >= 0) {
return TextUtils.packRangeInLong(offset - 1, offset); return TextUtils.packRangeInLong(getNextCursorOffset(offset, false), offset);
} }
return TextUtils.packRangeInLong(offset, offset); return TextUtils.packRangeInLong(offset, offset);
} }
private boolean touchPositionIsInSelection() { private boolean touchPositionIsInSelection() {
@@ -3942,7 +3938,7 @@ public class Editor {
int alteredOffset = mTextView.getOffsetAtCoordinate(mPrevLine, x); int alteredOffset = mTextView.getOffsetAtCoordinate(mPrevLine, x);
if (alteredOffset >= selectionEnd) { if (alteredOffset >= selectionEnd) {
// Can't pass the other drag handle. // Can't pass the other drag handle.
offset = Math.max(0, selectionEnd - 1); offset = getNextCursorOffset(selectionEnd, false);
} else { } else {
offset = alteredOffset; offset = alteredOffset;
} }
@@ -4041,7 +4037,7 @@ public class Editor {
int length = mTextView.getText().length(); int length = mTextView.getText().length();
if (alteredOffset <= selectionStart) { if (alteredOffset <= selectionStart) {
// Can't pass the other drag handle. // Can't pass the other drag handle.
offset = Math.min(selectionStart + 1, length); offset = getNextCursorOffset(selectionStart, true);
} else { } else {
offset = Math.min(alteredOffset, length); offset = Math.min(alteredOffset, length);
} }