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

Merge "Fix insert mode draws extra rectangle at the end of the first line" into udc-dev

Browse Source
This commit is contained in:
Haoyu Zhang
2023-04-08 19:49:16 +00:00
committed by Android (Google) Code Review
parent 74b386c973 5a7bf6e00a
commit 4a0f969ce1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8095,12 +8095,14 @@ public class Editor {
private boolean mIsInsertModeActive;
private InsertModeTransformationMethod mInsertModeTransformationMethod;
private final Paint mHighlightPaint;
private final Path mHighlightPath;
InsertModeController(@NonNull TextView textView) {
mTextView = Objects.requireNonNull(textView);
mIsInsertModeActive = false;
mInsertModeTransformationMethod = null;
mHighlightPaint = new Paint();
mHighlightPath = new Path();
// The highlight color is supposed to be 12% of the color primary40. We can't
// directly access Material 3 theme. But because Material 3 sets the colorPrimary to
@@ -8168,10 +8170,8 @@ public class Editor {
((InsertModeTransformationMethod.TransformedText) transformedText);
final int highlightStart = insertModeTransformedText.getHighlightStart();
final int highlightEnd = insertModeTransformedText.getHighlightEnd();
final Layout.SelectionRectangleConsumer consumer =
(left, top, right, bottom, textSelectionLayout) ->
canvas.drawRect(left, top, right, bottom, mHighlightPaint);
layout.getSelection(highlightStart, highlightEnd, consumer);
layout.getSelectionPath(highlightStart, highlightEnd, mHighlightPath);
canvas.drawPath(mHighlightPath, mHighlightPaint);
}
}