| commit | 54d0ebfa2aac199f1645396ac8f22ba2ddc41ffb | [log] [tgz] |
|---|---|---|
| author | Justin Ghan <justinghan@google.com> | Wed Sep 20 18:32:49 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 20 18:32:49 2023 +0000 |
| tree | 615304aa06e7373879ddb9b8dc4c3109554012ac | |
| parent | e2cbb4d7a5bdb3462647eb78c9bd928df78624bc [diff] | |
| parent | 5e81476be9b1df5f68b573c12cd8f7737a689441 [diff] |
Merge "Fix CursorAnchorInfo insertion marker location when cursor is clamped" into udc-qpr-dev am: 5e81476be9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24802396 Change-Id: I1318aa8718e5f16c1ba13ee3eb7717b051dc0f62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a48277d..6512d90 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;