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

Merge "Ensures the slop value is fixed cross lines." into rvc-qpr-dev am: 660a872c7a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12209645

Change-Id: If8e852b1f54bd1f4091f8c01d3f2d7ebc2e7805f
This commit is contained in:
Shu Chen
2020-07-24 01:24:04 +00:00
committed by Automerger Merge Worker
parent 25c7073289 660a872c7a
commit a893415d5c
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6059,12 +6059,7 @@ public class Editor {
return trueLine; return trueLine;
} }
final int lineHeight = layout.getLineBottom(prevLine) - layout.getLineTop(prevLine); final int slop = (int)(LINE_SLOP_MULTIPLIER_FOR_HANDLEVIEWS * mTextView.getLineHeight());
int slop = (int)(LINE_SLOP_MULTIPLIER_FOR_HANDLEVIEWS
* (layout.getLineBottom(trueLine) - layout.getLineTop(trueLine)));
slop = Math.max(mLineChangeSlopMin,
Math.min(mLineChangeSlopMax, lineHeight + slop)) - lineHeight;
slop = Math.max(0, slop);
final float verticalOffset = mTextView.viewportToContentVerticalOffset(); final float verticalOffset = mTextView.viewportToContentVerticalOffset();
if (trueLine > prevLine && y >= layout.getLineBottom(prevLine) + slop + verticalOffset) { if (trueLine > prevLine && y >= layout.getLineBottom(prevLine) + slop + verticalOffset) {