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

Commit 2fefe88e authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Use end-bounds for pip-animations that start in the end state" into... 

Merge "Use end-bounds for pip-animations that start in the end state" into tm-qpr-dev am: 09f9f98e

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



Change-Id: Ic8a6fe111486e28f95f7cba6f029b89a97c61453
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02ae9c55 09f9f98e

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

+6 −0
Original line number Diff line number Diff line
@@ -225,6 +225,12 @@ public class PipTransition extends PipTransitionController { 
        // For transition that we don't animate, but contains the PIP leash, we need to update the

        // PIP surface, otherwise it will be reset after the transition.

        if (currentPipTaskChange != null) {

            // Set the "end" bounds of pip. The default setup uses the start bounds. Since this is

            // changing the *finish*Transaction, we need to use the end bounds. This will also

            // make sure that the fade-in animation (below) uses the end bounds as well.

            if (!currentPipTaskChange.getEndAbsBounds().isEmpty()) {

                mPipBoundsState.setBounds(currentPipTaskChange.getEndAbsBounds());

            }

            updatePipForUnhandledTransition(currentPipTaskChange, startTransaction,

                    finishTransaction);

        }

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt

+0 −10
Original line number Diff line number Diff line
@@ -27,12 +27,10 @@ import com.android.server.wm.flicker.annotation.Group4 
import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.entireScreenCovered

import com.android.server.wm.flicker.helpers.WindowUtils

import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled

import com.android.server.wm.flicker.helpers.setRotation

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.wm.shell.flicker.helpers.FixedAppHelper

import org.junit.Assume

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -141,14 +139,6 @@ open class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testS 
    @Presubmit

    @Test

    fun pipLayerRotates_StartingBounds() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        pipLayerRotates_StartingBounds_internal()

    }



    @FlakyTest(bugId = 228024285)

    @Test

    fun pipLayerRotates_StartingBounds_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        pipLayerRotates_StartingBounds_internal()

    }