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

Merge "Text selection: When user reaches midpoint jump to end of word" into mnc-dev

Browse Source
This commit is contained in:
Mady Mellor
2015-06-26 17:37:51 +00:00
committed by Android (Google) Code Review
parent 10f9251736 8fc9bed985
commit 29f37e1597
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4173,7 +4173,7 @@ public class Editor {
if (!mInWord || currLine < mPrevLine) { if (!mInWord || currLine < mPrevLine) {
// We're not in a word, or we're on a different line so we'll expand by // 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. // 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) { if (offset <= end - offsetToWord || currLine < mPrevLine) {
offset = start; offset = start;
} else { } else {
@@ -4354,7 +4354,7 @@ public class Editor {
if (!mInWord || currLine > mPrevLine) { if (!mInWord || currLine > mPrevLine) {
// We're not in a word, or we're on a different line so we'll expand by // 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. // 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) { if (offset >= start + midPoint || currLine > mPrevLine) {
offset = end; offset = end;
} else { } else {