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

Commit d0eab2b4 authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Reduce flicker memory consumption (Pt 4)" into sc-dev am: 283866d8 am: fdf3d39d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9463849a8e1f8a039c48bb315d49b6c786d3e7cb
parents 4ec36a5c fdf3d39d

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt

+4 −8
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.platform.test.annotations.Presubmit 
import android.os.SystemClock

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.Flicker

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

import com.android.server.wm.flicker.dsl.FlickerBuilder
@@ -46,10 +45,8 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class AppPairsTestCannotPairNonResizeableApps(

    testName: String,

    flickerProvider: () -> Flicker,

    cleanUp: Boolean

) : FlickerTestRunner(testName, flickerProvider, cleanUp) {

    testSpec: FlickerTestRunnerFactory.TestSpec

) : FlickerTestRunner(testSpec) {

    companion object : AppPairsTransition(InstrumentationRegistry.getInstrumentation()) {

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

        @JvmStatic
@@ -83,9 +80,8 @@ class AppPairsTestCannotPairNonResizeableApps( 
                }

            }



            return FlickerTestRunnerFactory(instrumentation,

                repetitions = AppPairsHelper.TEST_REPETITIONS)

                .buildTest(transition, testSpec)

            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation,

                transition, testSpec, repetitions = AppPairsHelper.TEST_REPETITIONS)

        }

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt

+6 −10
Original line number Diff line number Diff line
@@ -21,13 +21,12 @@ import android.os.SystemClock 
import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.Flicker

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

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

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

import com.android.server.wm.flicker.traces.layers.getVisibleBounds

import com.android.wm.shell.flicker.FlickerTestBase

import com.android.wm.shell.flicker.FlickerTestBase.Companion.APP_PAIR_SPLIT_DIVIDER

import com.android.wm.shell.flicker.appPairsDividerIsVisible

import com.android.wm.shell.flicker.helpers.AppPairsHelper

import org.junit.FixMethodOrder
@@ -44,10 +43,8 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class AppPairsTestPairPrimaryAndSecondaryApps(

    testName: String,

    flickerProvider: () -> Flicker,

    cleanUp: Boolean

) : FlickerTestRunner(testName, flickerProvider, cleanUp) {

    testSpec: FlickerTestRunnerFactory.TestSpec

) : FlickerTestRunner(testSpec) {

    companion object : AppPairsTransition(InstrumentationRegistry.getInstrumentation()) {

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

        @JvmStatic
@@ -67,8 +64,7 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
                    layersTrace {

                        appPairsDividerIsVisible()

                        end("appsEndingBounds", enabled = false) {

                            val dividerRegion = entry.getVisibleBounds(

                                    FlickerTestBase.APP_PAIR_SPLIT_DIVIDER)

                            val dividerRegion = entry.getVisibleBounds(APP_PAIR_SPLIT_DIVIDER)

                            this.hasVisibleRegion(primaryApp.defaultWindowName,

                                appPairsHelper.getPrimaryBounds(dividerRegion))

                                .hasVisibleRegion(secondaryApp.defaultWindowName,
@@ -83,8 +79,8 @@ class AppPairsTestPairPrimaryAndSecondaryApps( 
                    }

                }

            }

            return FlickerTestRunnerFactory(instrumentation,

                repetitions = AppPairsHelper.TEST_REPETITIONS).buildTest(transition, testSpec)

            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation, transition,

                testSpec, repetitions = AppPairsHelper.TEST_REPETITIONS)

        }

    }

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt

+6 −10
Original line number Diff line number Diff line
@@ -21,13 +21,12 @@ import android.os.SystemClock 
import android.platform.test.annotations.Presubmit

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.Flicker

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

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

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

import com.android.server.wm.flicker.traces.layers.getVisibleBounds

import com.android.wm.shell.flicker.FlickerTestBase

import com.android.wm.shell.flicker.FlickerTestBase.Companion.APP_PAIR_SPLIT_DIVIDER

import com.android.wm.shell.flicker.appPairsDividerIsInvisible

import com.android.wm.shell.flicker.helpers.AppPairsHelper

import org.junit.FixMethodOrder
@@ -44,10 +43,8 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class AppPairsTestUnpairPrimaryAndSecondaryApps(

    testName: String,

    flickerProvider: () -> Flicker,

    cleanUp: Boolean

) : FlickerTestRunner(testName, flickerProvider, cleanUp) {

    testSpec: FlickerTestRunnerFactory.TestSpec

) : FlickerTestRunner(testSpec) {

    companion object : AppPairsTransition(InstrumentationRegistry.getInstrumentation()) {

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

        @JvmStatic
@@ -72,8 +69,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
                    layersTrace {

                        appPairsDividerIsInvisible()

                        start("appsStartingBounds", enabled = false) {

                            val dividerRegion = entry.getVisibleBounds(

                                FlickerTestBase.APP_PAIR_SPLIT_DIVIDER)

                            val dividerRegion = entry.getVisibleBounds(APP_PAIR_SPLIT_DIVIDER)

                            this.hasVisibleRegion(primaryApp.defaultWindowName,

                                appPairsHelper.getPrimaryBounds(dividerRegion))

                                .hasVisibleRegion(secondaryApp.defaultWindowName,
@@ -92,8 +88,8 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( 
                    }

                }

            }

            return FlickerTestRunnerFactory(instrumentation,

                repetitions = AppPairsHelper.TEST_REPETITIONS).buildTest(transition, testSpec)

            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation, transition,

                testSpec, repetitions = AppPairsHelper.TEST_REPETITIONS)

        }

    }

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt

+5 −9
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.platform.test.annotations.Presubmit 
import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.Flicker

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

import com.android.server.wm.flicker.dsl.FlickerBuilder
@@ -54,16 +53,13 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class RotateTwoLaunchedAppsInAppPairsMode(

    testName: String,

    flickerProvider: () -> Flicker,

    cleanUp: Boolean

) : FlickerTestRunner(testName, flickerProvider, cleanUp) {

    testSpec: FlickerTestRunnerFactory.TestSpec

) : FlickerTestRunner(testSpec) {

    companion object : RotateTwoLaunchedAppsTransition(

        InstrumentationRegistry.getInstrumentation()) {

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

        @JvmStatic

        fun getParams(): Collection<Array<Any>> {

            val instrumentation = InstrumentationRegistry.getInstrumentation()

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

                withTestName {

                    buildTestTag("testRotateTwoLaunchedAppsInAppPairsMode", configuration)
@@ -96,10 +92,10 @@ class RotateTwoLaunchedAppsInAppPairsMode( 
                }

            }



            return FlickerTestRunnerFactory(instrumentation,

            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation,

                transition, testSpec,

                repetitions = SplitScreenHelper.TEST_REPETITIONS,

                supportedRotations = listOf(Surface.ROTATION_90, Surface.ROTATION_270)

            ).buildTest(transition, testSpec)

                supportedRotations = listOf(Surface.ROTATION_90, Surface.ROTATION_270))

        }

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt

+5 −8
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.platform.test.annotations.Presubmit 
import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.Flicker

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

import com.android.server.wm.flicker.dsl.FlickerBuilder
@@ -54,16 +53,13 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode(

    testName: String,

    flickerProvider: () -> Flicker,

    cleanUp: Boolean

) : FlickerTestRunner(testName, flickerProvider, cleanUp) {

    testSpec: FlickerTestRunnerFactory.TestSpec

) : FlickerTestRunner(testSpec) {

    companion object : RotateTwoLaunchedAppsTransition(

        InstrumentationRegistry.getInstrumentation()) {

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

        @JvmStatic

        fun getParams(): Collection<Array<Any>> {

            val instrumentation = InstrumentationRegistry.getInstrumentation()

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

                withTestName {

                    buildTestTag("testRotateAndEnterAppPairsMode", configuration)
@@ -96,10 +92,11 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( 
                }

            }



            return FlickerTestRunnerFactory(instrumentation,

            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation,

                transition, testSpec,

                repetitions = SplitScreenHelper.TEST_REPETITIONS,

                supportedRotations = listOf(Surface.ROTATION_90, Surface.ROTATION_270)

            ).buildTest(transition, testSpec)

            )

        }

    }

}
 
 No newline at end of file