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

am 9ebbbf10: am 11b64410: Merge "Text selection: fix snapping to words when words break across lines" into mnc-dev

Browse Source 
* commit '9ebbbf107077a7de30491fbaa3b4a2ab9b826775':
  Text selection: fix snapping to words when words break across lines
This commit is contained in:
Mady Mellor
2015-06-26 22:54:57 +00:00
committed by Android Git Automerger
parent ba5c07286f 9ebbbf1070
commit 51673142ae
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4171,10 +4171,17 @@ public class Editor {
if (isExpanding) {
// User is increasing the selection.
if (!mInWord || currLine < mPrevLine) {
// We're not in a word, or we're on a different line so we'll expand by
// word. First ensure the user has at least entered the next word.
int offsetToWord = (end - start) / 2;
if (offset <= end - offsetToWord || currLine < mPrevLine) {
// Sometimes words can be broken across lines (Chinese, hyphenation).
// We still snap to the start of the word but we only use the letters on the
// current line to determine if the user is far enough into the word to snap.
int wordStartOnCurrLine = start;
if (layout != null && layout.getLineForOffset(start) != currLine) {
wordStartOnCurrLine = layout.getLineStart(currLine);
}
int offsetThresholdToSnap = end - ((end - wordStartOnCurrLine) / 2);
if (offset <= offsetThresholdToSnap || currLine < mPrevLine) {
// User is far enough into the word or on a different
// line so we expand by word.
offset = start;
} else {
offset = mPreviousOffset;
@@ -4352,10 +4359,17 @@ public class Editor {
if (isExpanding) {
// User is increasing the selection.
if (!mInWord || currLine > mPrevLine) {
// We're not in a word, or we're on a different line so we'll expand by
// word. First ensure the user has at least entered the next word.
int midPoint = (end - start) / 2;
if (offset >= start + midPoint || currLine > mPrevLine) {
// Sometimes words can be broken across lines (Chinese, hyphenation).
// We still snap to the end of the word but we only use the letters on the
// current line to determine if the user is far enough into the word to snap.
int wordEndOnCurrLine = end;
if (layout != null && layout.getLineForOffset(end) != currLine) {
wordEndOnCurrLine = layout.getLineEnd(currLine);
}
final int offsetThresholdToSnap = start + ((wordEndOnCurrLine - start) / 2);
if (offset >= offsetThresholdToSnap || currLine > mPrevLine) {
// User is far enough into the word or on a different
// line so we expand by word.
offset = end;
} else {
offset = mPreviousOffset;