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

Commit 889f7b99 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Unify common into parser and flicker 

Since winscope no longer uses flicker code, we don't need to compile
all the code to JS. This means we can reuse the standard Android
objects and simplify the code

This CL updates the import path removing the distinction between common
and device subpackages

Bug: 311642700
Test: atest FlickerLibTest FlickerLibUtilTests FlickerLibE2eTest
Change-Id: I99adee33658007d696d60cfff575e87e6419cf8d
parent 9327855e

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

+4 −4
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.common.traces.component.ComponentNameMatcher

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerTestData

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

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 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

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



import android.platform.test.annotations.Postsubmit

import android.tools.common.flicker.assertions.FlickerTest

import android.tools.common.traces.component.ComponentNameMatcher

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.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 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

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



import android.platform.test.annotations.Postsubmit

import android.tools.common.Rotation

import android.tools.common.flicker.assertions.FlickerTest

import android.tools.common.traces.component.ComponentNameMatcher

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.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 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

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


import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDevice

import android.tools.common.NavBar

import android.tools.common.Rotation

import android.tools.common.datatypes.Rect

import android.tools.common.flicker.assertions.FlickerTest

import android.tools.common.traces.component.ComponentNameMatcher

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.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 org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith

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

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



import android.platform.test.annotations.Postsubmit

import android.tools.common.Rotation

import android.tools.common.flicker.assertions.FlickerTest

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.device.helpers.WindowUtils

import android.tools.Rotation

import android.tools.flicker.assertions.FlickerTest

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.helpers.WindowUtils

import androidx.test.filters.RequiresDevice

import org.junit.Test

import org.junit.runner.RunWith