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

Commit ad88b689 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Reduce PiP flickering when switch apps with orientation change" into... 

Merge "Reduce PiP flickering when switch apps with orientation change" into udc-dev am: 4b4b8d7b am: eb3d22a1

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



Change-Id: I78b3df850f0fd3a25a2598220cadf1bfc536de2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d3ff1b54 eb3d22a1

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

+6 −5
Original line number Diff line number Diff line
@@ -249,11 +249,6 @@ public class PipTransition extends PipTransitionController { 
                    finishTransaction);

        }



        // Fade in the fadeout PIP when the fixed rotation is finished.

        if (mPipTransitionState.isInPip() && !mInFixedRotation && mHasFadeOut) {

            fadeExistingPip(true /* show */);

        }



        return false;

    }
@@ -1056,6 +1051,12 @@ public class PipTransition extends PipTransitionController { 
                .crop(finishTransaction, leash, destBounds)

                .round(finishTransaction, leash, isInPip)

                .shadow(finishTransaction, leash, isInPip);

        // Make sure the PiP keeps invisible if it was faded out. If it needs to fade in, that will

        // be handled by onFixedRotationFinished().

        if (isInPip && mHasFadeOut) {

            startTransaction.setAlpha(leash, 0f);

            finishTransaction.setAlpha(leash, 0f);

        }

    }



    /** Hides and shows the existing PIP during fixed rotation transition of other activities. */