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

Commit 450d861f authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Android (Google) Code Review
Browse files

Merge "Remove uneeded code now that onActivityUnpinned is called" into main

parents 5ec6a7f5 aeae3595

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

+0 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.tools.device.flicker.junit.FlickerParametersRunnerFactory 
import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.LegacyFlickerTest

import android.tools.device.flicker.legacy.LegacyFlickerTestFactory

import android.tools.common.flicker.subject.region.RegionTraceSubject

import android.tools.device.helpers.WindowUtils

import android.tools.device.traces.parsers.toFlickerComponent

import androidx.test.filters.RequiresDevice
@@ -87,8 +86,6 @@ class AutoEnterPipFromSplitScreenOnGoToHomeTest(flicker: LegacyFlickerTest) : 
                pipApp.enableAutoEnterForPipActivity()

            }

            teardown {

                // close gracefully so that onActivityUnpinned() can be called before force exit

                pipApp.closePipWindow(wmHelper)

                pipApp.exit(wmHelper)

                secondAppForSplitScreen.exit(wmHelper)

            }

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

+0 −2
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ open class AutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) : 


    override val defaultTeardown: FlickerBuilder.() -> Unit = {

        teardown {

            // close gracefully so that onActivityUnpinned() can be called before force exit

            pipApp.closePipWindow(wmHelper)

            pipApp.exit(wmHelper)

        }

    }

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

+0 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ class EnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) : EnterPipTransiti 


    override val defaultTeardown: FlickerBuilder.() -> Unit = {

        teardown {

            // close gracefully so that onActivityUnpinned() can be called before force exit

            pipApp.closePipWindow(wmHelper)

            pipApp.exit(wmHelper)

        }

    }