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

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

Change-Id: I458da9b5f7a1e0c146dc2706b9edd9fc976cc29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-17 00:20:23 +00:00
committed by Automerger Merge Worker

View File

@@ -586,6 +586,13 @@ public class PipTouchHandler {
return true; 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 // Update the touch state
mTouchState.onTouchEvent(ev); mTouchState.onTouchEvent(ev);