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

Commit 041b6c76 authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Check that the PiPParams are not null before getting seamless flag"... 

Merge "Check that the PiPParams are not null before getting seamless flag" into sc-dev am: 68a6b1a9

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

Change-Id: I39d6e7e9c10672bafc67ba1db263bc33c30d6a89
parents 3509b2e4 68a6b1a9

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

+1 −0
Original line number Diff line number Diff line
@@ -951,6 +951,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
                || direction == TRANSITION_DIRECTION_EXPAND_OR_UNEXPAND;

        // Animate with a cross-fade if enabled and seamless resize is disables by the app.

        final boolean animateCrossFadeResize = mayAnimateFinishResize

                && mPictureInPictureParams != null

                && !mPictureInPictureParams.isSeamlessResizeEnabled();

        if (animateCrossFadeResize) {

            // Take a snapshot of the PIP task and hide it. We'll show it and fade it out after