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

Commit 7f59e6f0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix app window detection on WM traces"

parents 9d51c735 6429892e

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

+3 −3
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ open class CloseImeWindowToHomeTest( 
    open fun checkVisibility_imeWindowBecomesInvisible() {

        checkResults {

            WmTraceSubject.assertThat(it)

                    .showsImeWindow(IME_WINDOW_TITLE)

                    .showsNonAppWindow(IME_WINDOW_TITLE)

                    .then()

                    .hidesImeWindow(IME_WINDOW_TITLE)

                    .hidesNonAppWindow(IME_WINDOW_TITLE)

                    .forAllEntries()

        }

    }
@@ -96,7 +96,7 @@ open class CloseImeWindowToHomeTest( 
            WmTraceSubject.assertThat(it)

                    .showsAppWindowOnTop(testApp.getPackage())

                    .then()

                    .hidesAppWindowOnTop(testApp.getPackage())

                    .appWindowNotOnTop(testApp.getPackage())

                    .forAllEntries()

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -54,9 +54,9 @@ class OpenImeWindowTest( 
        checkResults {

            WmTraceSubject.assertThat(it)

                    .skipUntilFirstAssertion()

                    .hidesImeWindow(IME_WINDOW_TITLE)

                    .hidesNonAppWindow(IME_WINDOW_TITLE)

                    .then()

                    .showsImeWindow(IME_WINDOW_TITLE)

                    .showsNonAppWindow(IME_WINDOW_TITLE)

                    .forAllEntries()

        }

    }

tests/FlickerTests/src/com/android/server/wm/flicker/pip/PipToAppTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ class PipToAppTest( 
                    .then()

                    .showsAppWindowOnTop(testApp.getPackage())

                    .then()

                    .hidesAppWindowOnTop(testApp.getPackage())

                    .appWindowNotOnTop(testApp.getPackage())

                    .forAllEntries()

        }

    }