Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7282ed1f authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ia4d3b447191dd58ab92b6c84131f28a5fa0cf904
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9365794f 86793588

core/java/android/view/InsetsSource.java

+2 −1
Original line number Diff line number Diff line
@@ -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.