diff options
| author | 2022-09-26 20:39:00 +0000 | |
|---|---|---|
| committer | 2022-09-26 20:39:00 +0000 | |
| commit | 7282ed1f224fc561783bf90505b66b19c7bf9d84 (patch) | |
| tree | efc1a625b5f3824adb94f6edf2e3ed8629d26845 | |
| parent | 9365794f26b9b43715e1549fa27e86dd820308c7 (diff) | |
| parent | 8679358882e8fce1d367e101029e3b7d72405bf2 (diff) | |
Merge "Fixing input coordinates discrepancy" into tm-qpr-dev am: bf338c7633 am: 8679358882
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947893
Change-Id: Ia4d3b447191dd58ab92b6c84131f28a5fa0cf904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/view/InsetsSource.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/view/InsetsSource.java b/core/java/android/view/InsetsSource.java index 583252756b92..c8c941a220f0 100644 --- a/core/java/android/view/InsetsSource.java +++ b/core/java/android/view/InsetsSource.java @@ -22,6 +22,7 @@ import static android.view.InsetsSourceProto.VISIBLE; import static android.view.InsetsSourceProto.VISIBLE_FRAME; import static android.view.InsetsState.ITYPE_CAPTION_BAR; import static android.view.InsetsState.ITYPE_IME; +import static android.view.ViewRootImpl.CAPTION_ON_SHELL; import android.annotation.NonNull; import android.annotation.Nullable; @@ -148,7 +149,7 @@ public class InsetsSource implements Parcelable { // During drag-move and drag-resizing, the caption insets position may not get updated // before the app frame get updated. To layout the app content correctly during drag events, // we always return the insets with the corresponding height covering the top. - if (getType() == ITYPE_CAPTION_BAR) { + if (!CAPTION_ON_SHELL && getType() == ITYPE_CAPTION_BAR) { return Insets.of(0, frame.height(), 0, 0); } // Checks for whether there is shared edge with insets for 0-width/height window. |