Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0c307d8 authored by Mady Mellor's avatar Mady Mellor Committed by Android Git Automerger
Browse files

am 2a8f0ca4: am 29f37e15: Merge "Text selection: When user reaches midpoint... 

am 2a8f0ca4: am 29f37e15: Merge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev

* commit '2a8f0ca4':
  Text selection: When user reaches midpoint jump to end of word
parents 130d8638 2a8f0ca4

core/java/android/widget/Editor.java

+2 −2
Original line number Diff line number Diff line
@@ -4173,7 +4173,7 @@ public class Editor { 
                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 = Math.min((end - start) / 2, 2);

                    int offsetToWord = (end - start) / 2;

                    if (offset <= end - offsetToWord || currLine < mPrevLine) {

                        offset = start;

                    } else {
@@ -4354,7 +4354,7 @@ public class Editor { 
                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 = Math.min((end - start) / 2, 2);

                    int midPoint = (end - start) / 2;

                    if (offset >= start + midPoint || currLine > mPrevLine) {

                        offset = end;

                    } else {