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

Commit 714c68de authored by Nataniel Borges's avatar Nataniel Borges
Browse files

3/ Simplify wait for full screen app 

Previously is didn't consider the layer to be visible nor the Wm state to be idle, which could cause instability

Also, fix ktlint formatting issues

Bug: 236131465
Test: atest FlickerTests
Change-Id: Ia7d1a012221c2b76b472108ea80b12837d4ebce6
parent b70cf57b

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt

+1 −4
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 


package com.android.server.wm.flicker.helpers



import android.app.Instrumentation

import android.view.WindowInsets.Type.ime

import android.view.WindowInsets.Type.navigationBars

import android.view.WindowInsets.Type.statusBars



import android.app.Instrumentation

import androidx.test.uiautomator.By

import androidx.test.uiautomator.UiDevice

import androidx.test.uiautomator.Until
@@ -28,7 +27,6 @@ import com.android.server.wm.flicker.testapp.ActivityOptions 
import com.android.server.wm.traces.common.FlickerComponentName

import com.android.server.wm.traces.parser.toFlickerComponent

import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper



import java.util.regex.Pattern



class ImeAppAutoFocusHelper @JvmOverloads constructor(
@@ -75,7 +73,6 @@ class ImeAppAutoFocusHelper @JvmOverloads constructor( 
                    "was left in an unknown state (e.g. Screen turned off)"

        }

        button.click()

        wmHelper.waitForAppTransitionIdle()

        wmHelper.waitForFullScreenApp(

                ActivityOptions.DIALOG_THEMED_ACTIVITY_COMPONENT_NAME.toFlickerComponent())

        mInstrumentation.waitForIdleSync()

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/NewTasksAppHelper.kt

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ class NewTasksAppHelper @JvmOverloads constructor( 
                    "was left in an unknown state (e.g. in split screen)"

        }

        button.click()

        wmHelper.waitForAppTransitionIdle()

        wmHelper.waitForFullScreenApp(component)

    }

}

tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt

+1 −3
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import android.view.Surface 
import android.view.WindowManagerPolicyConstants

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

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

import com.android.server.wm.flicker.FlickerBuilderProvider

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

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

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

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

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

import com.android.server.wm.flicker.helpers.WindowUtils
@@ -41,7 +41,6 @@ import com.android.server.wm.traces.common.WindowManagerConditionsFactory 
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper

import org.junit.Assume

import org.junit.Before



import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -111,7 +110,6 @@ open class SwitchImeWindowsFromGestureNavTest(private val testSpec: FlickerTestP 
                        displayBounds.bounds.width, displayBounds.bounds.height, 50)



                wmHelper.waitForFullScreenApp(testApp.component)

                wmHelper.waitForAppTransitionIdle()

                createTag(TAG_IME_INVISIBLE)

            }

            transitions {