commit e9d561e68a245aa195b07e834ec135335c038cc0
author Justin Ghan <justinghan@google.com> Tue Sep 19 13:38:25 2023 -0700
committer Justin Ghan <justinghan@google.com> Tue Sep 19 13:48:06 2023 -0700
tree c7697d39e79795ff5afc1c72ac46d224bf286b2d
parent 1b2195f6495ac8f19defcfd40b856f0212f116d6

Fix CursorAnchorInfo insertion marker location when cursor is clamped

Bug: 301135322
Test: tested manually
Change-Id: I6d2d43330fff57115c09222836d2475dbd1444ee

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 63e8825..c990e94 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -14051,7 +14051,8 @@
                             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;