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

Commit 0f480daa authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change ShellTransitionScenarioExtractor to TaggedScenarioExtractor for... 

Merge "Change ShellTransitionScenarioExtractor to TaggedScenarioExtractor for Desktop Windowing CORNER_RESIZE flicker test so that it collects the relevant jank traces during resizing and reduce flakiness." into main
parents eee54419 460f4201

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/flicker/DesktopModeFlickerScenarios.kt

+13 −17
Original line number Original line Diff line number Diff line
@@ -32,6 +32,9 @@ import android.tools.flicker.config.ScenarioId 
import android.tools.flicker.config.desktopmode.Components

import android.tools.flicker.config.desktopmode.Components

import android.tools.flicker.extractors.ITransitionMatcher

import android.tools.flicker.extractors.ITransitionMatcher

import android.tools.flicker.extractors.ShellTransitionScenarioExtractor

import android.tools.flicker.extractors.ShellTransitionScenarioExtractor

import android.tools.flicker.extractors.TaggedCujTransitionMatcher

import android.tools.flicker.extractors.TaggedScenarioExtractorBuilder

import android.tools.traces.events.CujType

import android.tools.traces.wm.Transition

import android.tools.traces.wm.Transition

import android.tools.traces.wm.TransitionType

import android.tools.traces.wm.TransitionType
@@ -121,18 +124,11 @@ class DesktopModeFlickerScenarios { 
            FlickerConfigEntry(

            FlickerConfigEntry(

                scenarioId = ScenarioId("CORNER_RESIZE"),

                scenarioId = ScenarioId("CORNER_RESIZE"),

                extractor =

                extractor =

                ShellTransitionScenarioExtractor(

                    TaggedScenarioExtractorBuilder()

                    transitionMatcher =

                        .setTargetTag(CujType.CUJ_DESKTOP_MODE_RESIZE_WINDOW)

                    object : ITransitionMatcher {

                        .setTransitionMatcher(

                        override fun findAll(

                            TaggedCujTransitionMatcher(associatedTransitionRequired = false)

                            transitions: Collection<Transition>

                        ).build(),

                        ): Collection<Transition> {

                            return transitions.filter {

                                it.type == TransitionType.CHANGE

                            }

                        }

                    }

                ),

                assertions =

                assertions =

                    listOf(

                    listOf(

                        AppWindowIsVisibleAlways(Components.DESKTOP_MODE_APP),

                        AppWindowIsVisibleAlways(Components.DESKTOP_MODE_APP),