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

Commit 5da6a549 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 

am: f7a0c644

Change-Id: I77d9c62a752b48efd31f26e1ad91a93233157e4c
parents 5a5faf3b f7a0c644

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() {