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

am f0522882: Merge "Insertion cursor: add some slop for moving between lines" into mnc-dev

Browse Source 
* commit 'f05228822c5da6333f20dc3a29c8f064b7562e06':
  Insertion cursor: add some slop for moving between lines
This commit is contained in:
Mady Mellor
2015-06-17 17:13:56 +00:00
committed by Android Git Automerger
parent d3858e4574 f05228822c
commit ef25faa09d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4013,7 +4013,15 @@ public class Editor {
@Override @Override
public void updatePosition(float x, float y) { public void updatePosition(float x, float y) {
positionAtCursorOffset(mTextView.getOffsetForPosition(x, y), false); Layout layout = mTextView.getLayout();
int offset;
if (layout != null) {
int currLine = getCurrentLineAdjustedForSlop(layout, mPrevLine, y);
offset = mTextView.getOffsetAtCoordinate(currLine, x);
} else {
offset = mTextView.getOffsetForPosition(x, y);
}
positionAtCursorOffset(offset, false);
if (mTextActionMode != null) { if (mTextActionMode != null) {
mTextActionMode.invalidate(); mTextActionMode.invalidate();
} }