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

Commit ec4878cc authored by Toshiki Kikuchi's avatar Toshiki Kikuchi Committed by Android (Google) Code Review
Browse files

Merge "Skip drag-to-exit-desktop test when drag-to-maximize is enabled" into main

parents 4fd9e938 90266ed4

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/ExitDesktopWithDragToTopDragZone.kt

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.scenarios 


import android.tools.NavBar

import android.tools.Rotation

import com.android.internal.R

import com.android.window.flags.Flags

import com.android.wm.shell.Utils

import org.junit.After
@@ -40,6 +41,9 @@ constructor( 
    @Before

    fun setup() {

        Assume.assumeTrue(Flags.enableDesktopWindowingMode() && tapl.isTablet)

        // Skip the test when the drag-to-maximize is enabled on this device.

        Assume.assumeFalse(Flags.enableDragToMaximize() &&

            instrumentation.context.resources.getBoolean(R.bool.config_dragToMaximizeInDesktopMode))

        tapl.setEnableRotation(true)

        tapl.setExpectedRotation(rotation.value)

        testApp.enterDesktopWithDrag(wmHelper, device)