Merge "Fixing input coordinates discrepancy" into tm-qpr-dev am: bf338c7633

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947893

Change-Id: I471736a34549e0201bdeba90c7060894a964f338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maryam Dehaini
2022-09-26 20:32:35 +00:00
committed by Automerger Merge Worker

View File

@@ -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.