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

Commit 72a2ee0b authored by CHIA-HSUAN HSU's avatar CHIA-HSUAN HSU
Browse files

Make dimensions uniform in DP 

Test: USE_RBE=false atest WMShellFlickerTestsDesktopMode:com.android.wm.shell.flicker.resizing.ResizeAppToMinimumWindowSizeFlickerTest -c (http://ab/I73000010426497719)
Flag: EXEMPT minor test refactoring
Bug: 420651485
Change-Id: I183fcd4dfa34c61d49414fa180bf9586c15241b0
parent 6b0cf87d

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/DesktopModeFlickerScenarios.kt

+4 −4
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package com.android.wm.shell.flicker



import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT

import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_WIDTH

import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT_DP

import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_WIDTH_DP

import android.tools.flicker.AssertionInvocationGroup

import android.tools.flicker.assertors.assertions.AppLayerCoversFullScreenAtEnd

import android.tools.flicker.assertors.assertions.ResizeVeilKeepsIncreasingInSize
@@ -259,8 +259,8 @@ class DesktopModeFlickerScenarios { 
                        listOf(

                            AppWindowHasSizeOfAtLeast(

                                DESKTOP_MODE_APP,

                                DESKTOP_MODE_MINIMUM_WINDOW_WIDTH,

                                DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT

                                DESKTOP_MODE_MINIMUM_WINDOW_WIDTH_DP,

                                DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT_DP

                            )

                        )

                            .associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/resizing/ResizeAppToMinimumWindowSizeFlickerTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package com.android.wm.shell.flicker.resizing 
import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.RequiresDesktopDevice

import android.tools.NavBar

import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT

import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_WIDTH

import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT_DP

import android.tools.PlatformConsts.DESKTOP_MODE_MINIMUM_WINDOW_WIDTH_DP

import android.tools.flicker.assertions.FlickerChecker

import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.FlickerBuilder
@@ -76,8 +76,8 @@ class ResizeAppToMinimumWindowSizeFlickerTest(flicker: FlickerTest) : DesktopMod 
    @Test

    fun appLayerHasSizeAtEnd() = flicker.appLayerHasSizeAtEnd(

        testApp,

        DESKTOP_MODE_MINIMUM_WINDOW_WIDTH,

        DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT

        DESKTOP_MODE_MINIMUM_WINDOW_WIDTH_DP,

        DESKTOP_MODE_MINIMUM_WINDOW_HEIGHT_DP

    )



    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/utils/DesktopModeCommonAssertions.kt

+5 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.tools.PlatformConsts 
import android.tools.flicker.FlickerTest

import android.tools.helpers.WindowUtils

import android.tools.traces.component.IComponentMatcher

import android.tools.traces.wm.WindowManagerState



// Common assertions for Desktop mode features.
@@ -116,9 +117,11 @@ fun FlickerTest.resizeVeilKeepsDecreasingInSize(component: IComponentMatcher) { 


fun FlickerTest.appLayerHasSizeAtEnd(

    component: IComponentMatcher,

    width: Int,

    height: Int

    widthDp: Int,

    heightDp: Int

) {

    val width = WindowManagerState.dpToPx(widthDp.toFloat(), WindowUtils.defaultDisplayDpi)

    val height = WindowManagerState.dpToPx(heightDp.toFloat(), WindowUtils.defaultDisplayDpi)

    assertLayersEnd {

        visibleRegion(component).hasSameSize(width, height, diffThreshold = 50)

    }