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

Merge "Fix: line slop shouldn't always increase / decrease by one line" into mnc-dev

Browse Source
This commit is contained in:
Mady Mellor
2015-07-11 00:30:32 +00:00
committed by Android (Google) Code Review
parent a9f07ccf38 80679071ab
commit 1c277ca8cd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4438,10 +4438,16 @@ public class Editor {
} }
private int getCurrentLineAdjustedForSlop(Layout layout, int prevLine, float y) { private int getCurrentLineAdjustedForSlop(Layout layout, int prevLine, float y) {
final int trueLine = mTextView.getLineAtCoordinate(y);
if (layout == null || prevLine > layout.getLineCount() if (layout == null || prevLine > layout.getLineCount()
|| layout.getLineCount() <= 0 || prevLine < 0) { || layout.getLineCount() <= 0 || prevLine < 0) {
// Invalid parameters, just return whatever line is at y. // Invalid parameters, just return whatever line is at y.
return mTextView.getLineAtCoordinate(y); return trueLine;
}
if (Math.abs(trueLine - prevLine) >= 2) {
// Only stick to lines if we're within a line of the previous selection.
return trueLine;
} }
final float verticalOffset = mTextView.viewportToContentVerticalOffset(); final float verticalOffset = mTextView.viewportToContentVerticalOffset();