commit 5e81476be9b1df5f68b573c12cd8f7737a689441
author Justin Ghan <justinghan@google.com> Wed Sep 20 17:30:09 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 20 17:30:09 2023 +0000
tree a08946a574864a6553d748ed3b97bb57f109d507
parent f2795971a408aafb69c1699d1093be728c4924b6
parent e9d561e68a245aa195b07e834ec135335c038cc0

Merge "Fix CursorAnchorInfo insertion marker location when cursor is clamped" into udc-qpr-dev

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;