From e9d561e68a245aa195b07e834ec135335c038cc0 Mon Sep 17 00:00:00 2001 From: Justin Ghan Date: Tue, 19 Sep 2023 13:38:25 -0700 Subject: Fix CursorAnchorInfo insertion marker location when cursor is clamped Bug: 301135322 Test: tested manually Change-Id: I6d2d43330fff57115c09222836d2475dbd1444ee --- core/java/android/widget/TextView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 63e882533a4c..c990e941a11b 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -14051,7 +14051,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener selectionStart, OffsetMapping.MAP_STRATEGY_CURSOR); final int line = layout.getLineForOffset(offsetTransformed); final float insertionMarkerX = - layout.getPrimaryHorizontal(offsetTransformed) + layout.getPrimaryHorizontal( + offsetTransformed, layout.shouldClampCursor(line)) + viewportToContentHorizontalOffset; final float insertionMarkerTop = layout.getLineTop(line) + viewportToContentVerticalOffset; -- cgit v1.2.3-59-g8ed1b