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

Commit 701b2ee2 authored by Daniel Akinola's avatar Daniel Akinola Committed by Android (Google) Code Review
Browse files

Merge "Jank CUJ: Snap Resizing Non-Resizable" into main

parents 959c582f 60f8e736

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

+7 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import androidx.test.platform.app.InstrumentationRegistry 
import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

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

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

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

import com.android.window.flags.Flags

import org.junit.After
@@ -36,13 +37,17 @@ import org.junit.runners.BlockJUnit4ClassRunner 
@Postsubmit

open class SnapResizeAppWindowWithButton

@JvmOverloads

constructor(private val toLeft: Boolean = true) {

constructor(private val toLeft: Boolean = true, private val isResizable: Boolean = true) {



    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

    private val testApp = if (isResizable) {

        DesktopModeAppHelper(SimpleAppHelper(instrumentation))

    } else {

        DesktopModeAppHelper(NonResizeableAppHelper(instrumentation))

    }



    @Before

    fun setup() {

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

+7 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import androidx.test.platform.app.InstrumentationRegistry 
import androidx.test.uiautomator.UiDevice

import com.android.launcher3.tapl.LauncherInstrumentation

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

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

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

import com.android.window.flags.Flags

import org.junit.After
@@ -36,13 +37,17 @@ import org.junit.runners.BlockJUnit4ClassRunner 
@Postsubmit

open class SnapResizeAppWindowWithDrag

@JvmOverloads

constructor(private val toLeft: Boolean = true) {

constructor(private val toLeft: Boolean = true, private val isResizable: Boolean = true) {



    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

    private val device = UiDevice.getInstance(instrumentation)

    private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

    private val testApp = if (isResizable) {

        DesktopModeAppHelper(SimpleAppHelper(instrumentation))

    } else {

        DesktopModeAppHelper(NonResizeableAppHelper(instrumentation))

    }



    @Before

    fun setup() {