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

Commit 1307bfbd authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

Do not jumpcut PiP alpha anim on split-to-pip 

Split-to-PiP interactions might start a dismiss split
transition; and if such transition isn't a no-op
(such as when a direct enter PiP comes from either stage),
this follow-up transition might try to get merged into the original
split-to-pip, constantly jumpcutting to PiP instead of cross-fading.

Instead we want to finish running the PiP animation and schedule dismiss
split after.

Since split-to-pip enter CUJs are being fixed, we can also run
FromSplitScreenEnterPipOnUserLeaveHintTest and
FromSplitScreenAutoEnterPipOnGoToHomeTest in PiP2 as well now.

Bug: 388282194
Flag: com.android.wm.shell.enable_pip2
Test: atest FromSplitScreenAutoEnterPipOnGoToHomeTest
Test: atest FromSplitScreenEnterPipOnUserLeaveHintTest
Change-Id: I6c138e38c4af1bbf99a696289b648a119e61b692
parent f5b4905f

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedTransition.java

+0 −2
Original line number Diff line number Diff line
@@ -407,8 +407,6 @@ class DefaultMixedTransition extends DefaultMixedHandler.MixedTransition { 
                        mLeftoversHandler.mergeAnimation(

                                transition, info, t, mergeTarget, finishCallback);

                    }

                } else {

                    mPipHandler.end();

                }

                return;

            case TYPE_KEYGUARD:

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

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.pip 
import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import android.platform.test.annotations.RequiresFlagsDisabled

import android.tools.Rotation

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder
@@ -29,7 +28,6 @@ import android.tools.helpers.WindowUtils 
import android.tools.traces.parsers.toFlickerComponent

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

import com.android.server.wm.flicker.testapp.ActivityOptions

import com.android.wm.shell.Flags

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.Assume

import org.junit.FixMethodOrder
@@ -64,7 +62,6 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)

open class FromSplitScreenAutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) :

    AutoEnterPipOnGoToHomeTest(flicker) {

    private val portraitDisplayBounds = WindowUtils.getDisplayBounds(Rotation.ROTATION_0)

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

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.pip 
import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.RequiresDevice

import android.platform.test.annotations.RequiresFlagsDisabled

import android.tools.Rotation

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder
@@ -30,7 +29,6 @@ import android.tools.traces.parsers.toFlickerComponent 
import com.android.server.wm.flicker.helpers.PipAppHelper

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

import com.android.server.wm.flicker.testapp.ActivityOptions

import com.android.wm.shell.Flags

import com.android.wm.shell.flicker.pip.common.EnterPipTransition

import com.android.wm.shell.flicker.utils.SplitScreenUtils

import org.junit.Assume
@@ -66,7 +64,6 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)

@FlakyTest(bugId = 386333280)

open class FromSplitScreenEnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) :

    EnterPipTransition(flicker) {