Merge "Do not attempt auto-enter-pip if there is no valid leash" into tm-qpr-dev am: 40f049bcb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818897 Change-Id: Idf38229913c1e3aefd966d1924044df7a85c8ab7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1284,8 +1284,11 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
? runningTaskTarget.taskInfo.launchCookies
|
||||
: new ArrayList<>();
|
||||
boolean isTranslucent = runningTaskTarget != null && runningTaskTarget.isTranslucent;
|
||||
boolean hasValidLeash = runningTaskTarget != null
|
||||
&& runningTaskTarget.leash != null
|
||||
&& runningTaskTarget.leash.isValid();
|
||||
boolean appCanEnterPip = !mDeviceState.isPipActive()
|
||||
&& runningTaskTarget != null
|
||||
&& hasValidLeash
|
||||
&& runningTaskTarget.allowEnterPip
|
||||
&& runningTaskTarget.taskInfo.pictureInPictureParams != null
|
||||
&& runningTaskTarget.taskInfo.pictureInPictureParams.isAutoEnterEnabled();
|
||||
@@ -1394,9 +1397,6 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO(b/195473090) handle multiple task simulators (if needed) for PIP
|
||||
*/
|
||||
private SwipePipToHomeAnimator createWindowAnimationToPip(HomeAnimationFactory homeAnimFactory,
|
||||
RemoteAnimationTargetCompat runningTaskTarget, float startProgress) {
|
||||
// Directly animate the app to PiP (picture-in-picture) mode
|
||||
|
||||
Reference in New Issue
Block a user