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

Commit 173e7c2d authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Cleanup, remove unused objects"

parents 9dc49539 ec4ddde3

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt

+0 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import androidx.test.uiautomator.By 
import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.annotation.Group4

import com.android.server.wm.flicker.dsl.FlickerBuilder

import org.junit.Test

import org.junit.runner.RunWith
@@ -44,7 +43,6 @@ import org.junit.runners.Parameterized 
@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

open class DismissBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    private val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/ExpandBubbleScreen.kt

+0 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import androidx.test.uiautomator.By 
import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.annotation.Group4

import com.android.server.wm.flicker.dsl.FlickerBuilder

import org.junit.Test

import org.junit.runner.RunWith
@@ -41,7 +40,6 @@ import org.junit.runners.Parameterized 
@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

open class ExpandBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    /** {@inheritDoc} */

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleFromLockScreen.kt

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import androidx.test.uiautomator.By 
import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.annotation.Group4

import com.android.server.wm.flicker.dsl.FlickerBuilder

import org.junit.Test

import org.junit.runner.RunWith
@@ -42,7 +41,6 @@ import org.junit.runners.Parameterized 
@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

class LaunchBubbleFromLockScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    /** {@inheritDoc} */

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleScreen.kt

+0 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import androidx.test.uiautomator.By 
import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.annotation.Group4

import com.android.server.wm.flicker.dsl.FlickerBuilder

import org.junit.Test

import org.junit.runner.RunWith
@@ -39,7 +38,6 @@ import org.junit.runners.Parameterized 
@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

open class LaunchBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    /** {@inheritDoc} */

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/MultiBubblesScreen.kt

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import androidx.test.uiautomator.UiObject2 
import androidx.test.uiautomator.Until

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.annotation.Group4

import com.android.server.wm.flicker.dsl.FlickerBuilder

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

import org.junit.Assume
@@ -44,7 +43,6 @@ import org.junit.runners.Parameterized 
@RequiresDevice

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Group4

open class MultiBubblesScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(testSpec) {



    @Before