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

Commit 316b1f50 authored by Tracy Zhou's avatar Tracy Zhou
Browse files

Make PiP window visible when user launches PiP in landscape mode 

Two PiP animations are triggered when launching PiP in landscape mode
(one when first swiping up (FADE_IN), the other moves the PiP window to
portrait position (BOUNDS)). When screen rotation happens after the first
animation is started, it cancels it while leaving the window alpha to
close to 0. In order to make sure the window after rotation has the correct
alpha, we should set the alpha of the window when mCancelCurrentBoundsAnimation is true to 1.

Fixes: 133711307
Test: Play a YouTube video in landscape mode, and then swipe up. Make
sure that PiP window shows up after screen rotation forced by launcher
Test: atest PinnedStackTests
Change-Id: I3ec186b0e1e3f50dc91cfb03fc3847ddd7b5faef
parent 1f66726d

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

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

            if (mAnimationType == BoundsAnimationController.FADE_IN) {

                setPinnedStackAlpha(1f);

                setPinnedStackAlpha(1f);

                mActivityStack.mService.notifyPinnedStackAnimationEnded();

                mActivityStack.mService.notifyPinnedStackAnimationEnded();

                return;

            }

            }





            if (finalStackSize != null && !mCancelCurrentBoundsAnimation) {

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

    public boolean setPinnedStackAlpha(float alpha) {

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

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

        synchronized (mWmService.mGlobalLock) {

        synchronized (mWmService.mGlobalLock) {

            if (mCancelCurrentBoundsAnimation) {

            getPendingTransaction().setAlpha(getSurfaceControl(),

                return false;

                    mCancelCurrentBoundsAnimation ? 1 : alpha);

            }

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

            scheduleAnimation();

            scheduleAnimation();

            return !mCancelCurrentBoundsAnimation;

        }

        }



        return true;

    }

    }





    public DisplayInfo getDisplayInfo() {

    public DisplayInfo getDisplayInfo() {