| commit | 28e8b2c84acefeca7f9f868551f6e372414d90f1 | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Sat Jul 31 03:28:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 31 03:28:56 2021 +0000 |
| tree | 1e0008563bcd5a40276049f9924db49d0876b0a0 | |
| parent | e1ef8e8dc839cce9d932419f1472672b0c75316a [diff] | |
| parent | b999186b9ef6ce85cdfb8b0f58879458fb1dfe0e [diff] |
Merge "Check PiP permission before entering auto pip" into sc-v2-dev am: b999186b9e Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15376471 Change-Id: Iceef5384ac7eb7337ce29c1d80584a14c49a9e84
diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java index 97f46a5..6249e6a 100644 --- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java +++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1174,6 +1174,7 @@ boolean isTranslucent = runningTaskTarget != null && runningTaskTarget.isTranslucent; boolean appCanEnterPip = !mDeviceState.isPipActive() && runningTaskTarget != null + && runningTaskTarget.allowEnterPip && runningTaskTarget.taskInfo.pictureInPictureParams != null && runningTaskTarget.taskInfo.pictureInPictureParams.isAutoEnterEnabled(); HomeAnimationFactory homeAnimFactory =