| commit | abd74b94fad0ebfc8b51cbcd399f515d73ea0804 | [log] [tgz] |
|---|---|---|
| author | Hongwei Wang <hwwang@google.com> | Sat Jul 31 03:44:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Jul 31 03:44:39 2021 +0000 |
| tree | d834728db8016067215f92f4040d20f0c7253031 | |
| parent | be86a2638f3128ef7331c027823751fcad1a45cc [diff] | |
| parent | 28e8b2c84acefeca7f9f868551f6e372414d90f1 [diff] |
Merge "Check PiP permission before entering auto pip" into sc-v2-dev am: b999186b9e am: 28e8b2c84a Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15376471 Change-Id: Ibf5b4bcc9bb2d651a268a874a64df951138776cd
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 =