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

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

Merge "Delete flicker datatype objects" into main

parents 7ec08228 283e605f

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/BaseAppCompat.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
package com.android.wm.shell.flicker.appcompat



import android.content.Context

import android.tools.traces.component.ComponentNameMatcher

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.FlickerTestData

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.traces.component.ComponentNameMatcher

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

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

import com.android.wm.shell.flicker.BaseTest

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/OpenAppInSizeCompatModeTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.wm.shell.flicker.appcompat 


import android.platform.test.annotations.Postsubmit

import android.tools.flicker.assertions.FlickerTest

import android.tools.traces.component.ComponentNameMatcher

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

import android.tools.traces.component.ComponentNameMatcher

import androidx.test.filters.RequiresDevice

import org.junit.Test

import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/OpenTransparentActivityTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ package com.android.wm.shell.flicker.appcompat 
import android.platform.test.annotations.Postsubmit

import android.tools.Rotation

import android.tools.flicker.assertions.FlickerTest

import android.tools.traces.component.ComponentNameMatcher

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

import android.tools.traces.component.ComponentNameMatcher

import androidx.test.filters.RequiresDevice

import org.junit.Test

import org.junit.runner.RunWith

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/QuickSwitchLauncherToLetterboxAppTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -16,17 +16,17 @@ 


package com.android.wm.shell.flicker.appcompat



import android.graphics.Rect

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import android.tools.NavBar

import android.tools.Rotation

import android.tools.datatypes.Rect

import android.tools.flicker.assertions.FlickerTest

import android.tools.traces.component.ComponentNameMatcher

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.flicker.legacy.LegacyFlickerTestFactory

import android.tools.traces.component.ComponentNameMatcher

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -260,7 +260,7 @@ class QuickSwitchLauncherToLetterboxAppTest(flicker: LegacyFlickerTest) : BaseAp 


    companion object {

        /** {@inheritDoc} */

        private var startDisplayBounds = Rect.EMPTY

        private var startDisplayBounds = Rect()



        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

libs/WindowManager/Shell/tests/flicker/appcompat/src/com/android/wm/shell/flicker/appcompat/RepositionFixedPortraitAppTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

class RepositionFixedPortraitAppTest(flicker: LegacyFlickerTest) : BaseAppCompat(flicker) {



    val displayBounds = WindowUtils.getDisplayBounds(flicker.scenario.startRotation).bounds

    val displayBounds = WindowUtils.getDisplayBounds(flicker.scenario.startRotation)

    /** {@inheritDoc} */

    override val transition: FlickerBuilder.() -> Unit

        get() = {