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

Commit f7a0c644 authored by Tracy Zhou's avatar Tracy Zhou Committed by android-build-merger
Browse files

Merge "Make PiP window visible when user launches PiP in landscape mode" into qt-dev 

am: 94a1aafc

Change-Id: Ic2cbb2415f8e5bf5cde7e7ec265f00d0779d94ff
parents 6fef220b 94a1aafc

services/core/java/com/android/server/wm/TaskStack.java

+4 −6
Original line number Diff line number Diff line
@@ -1640,6 +1640,7 @@ public class TaskStack extends WindowContainer<Task> implements 
            if (mAnimationType == BoundsAnimationController.FADE_IN) {

                setPinnedStackAlpha(1f);

                mActivityStack.mService.notifyPinnedStackAnimationEnded();

                return;

            }



            if (finalStackSize != null && !mCancelCurrentBoundsAnimation) {
@@ -1935,14 +1936,11 @@ public class TaskStack extends WindowContainer<Task> implements 
    public boolean setPinnedStackAlpha(float alpha) {

        // Hold the lock since this is called from the BoundsAnimator running on the UiThread

        synchronized (mWmService.mGlobalLock) {

            if (mCancelCurrentBoundsAnimation) {

                return false;

            }

            getPendingTransaction().setAlpha(getSurfaceControl(), alpha);

            getPendingTransaction().setAlpha(getSurfaceControl(),

                    mCancelCurrentBoundsAnimation ? 1 : alpha);

            scheduleAnimation();

            return !mCancelCurrentBoundsAnimation;

        }



        return true;

    }



    public DisplayInfo getDisplayInfo() {