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

Commit f5fc2c1a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the pip bounds error when entering pip mode." am: 785394eb am:... 

Merge "Fix the pip bounds error when entering pip mode." am: 785394eb am: 5383d672 am: 3ed77457

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



Change-Id: I1d48f1fb986f46ad7c2855c94d94dc3644a4be8c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7c8b5393 3ed77457

libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipTouchHandler.java

+7 −0
Original line number Diff line number Diff line
@@ -586,6 +586,13 @@ public class PipTouchHandler { 
            return true;

        }



        // Ignore the motion event When the entry animation is waiting to be started

        if (!mTouchState.isUserInteracting() && mPipTaskOrganizer.isEntryScheduled()) {

            ProtoLog.wtf(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "%s: Waiting to start the entry animation, skip the motion event.", TAG);

            return true;

        }



        // Update the touch state

        mTouchState.onTouchEvent(ev);