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

Commit 62a1fd60 authored by Jeff Chang's avatar Jeff Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix EnterSplitScreenByDrag#cujCompleted" into udc-dev am: a3214b68 

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



Change-Id: I378c67e69f5760016f0ec696faa81320f8af90bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 046475fd a3214b68

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromAllApps.kt

+2 −1
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ class EnterSplitScreenByDragFromAllApps(flicker: FlickerTest) : SplitScreenBase( 
    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = false)

    fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = false,

            appExistAtStart = false)



    @Presubmit

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenByDragFromNotification.kt

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ class EnterSplitScreenByDragFromNotification(flicker: FlickerTest) : SplitScreen 
    @IwTest(focusArea = "sysui")

    @Presubmit

    @Test

    fun cujCompleted() = flicker.splitScreenEntered(primaryApp, secondaryApp, fromOtherApp = false)

    fun cujCompleted() = flicker.splitScreenEntered(primaryApp, sendNotificationApp,

            fromOtherApp = false)



    @Presubmit

    @Test