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

Commit fbd93a6f authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Fix wrong split bounds in legacy split flicker tests" into sc-dev am: 68667bdd 

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

Change-Id: Ie85a7b598b6fdf33fe841fd8b4aa55d44d9b524a
parents e8c7a1b0 68667bdd

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

+7 −10
Original line number Diff line number Diff line
@@ -115,23 +115,20 @@ fun getPrimaryRegion(dividerRegion: Region, rotation: Int): Region { 
    val displayBounds = WindowUtils.getDisplayBounds(rotation)

    return if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {

        Region(0, 0, displayBounds.bounds.right,

            dividerRegion.bounds.bottom - WindowUtils.dockedStackDividerInset)

            dividerRegion.bounds.top + WindowUtils.dockedStackDividerInset)

    } else {

        Region(0, 0, dividerRegion.bounds.left,

            dividerRegion.bounds.right - WindowUtils.dockedStackDividerInset)

        Region(0, 0, dividerRegion.bounds.left + WindowUtils.dockedStackDividerInset,

            displayBounds.bounds.bottom)

    }

}



fun getSecondaryRegion(dividerRegion: Region, rotation: Int): Region {

    val displayBounds = WindowUtils.getDisplayBounds(rotation)

    return if (rotation == Surface.ROTATION_0 || rotation == Surface.ROTATION_180) {

        Region(0,

            dividerRegion.bounds.bottom - WindowUtils.dockedStackDividerInset,

            displayBounds.bounds.right,

            displayBounds.bounds.bottom - WindowUtils.dockedStackDividerInset)

        Region(0, dividerRegion.bounds.bottom - WindowUtils.dockedStackDividerInset,

            displayBounds.bounds.right, displayBounds.bounds.bottom)

    } else {

        Region(dividerRegion.bounds.right, 0,

            displayBounds.bounds.right,

            displayBounds.bounds.bottom - WindowUtils.dockedStackDividerInset)

        Region(dividerRegion.bounds.right - WindowUtils.dockedStackDividerInset, 0,

            displayBounds.bounds.right, displayBounds.bounds.bottom)

    }

}
 
 No newline at end of file

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenDockActivity.kt

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.legacysplitscreen 


import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter
@@ -64,7 +63,7 @@ class EnterSplitScreenDockActivity( 
            splitScreenApp.defaultWindowName, WindowManagerStateHelper.SPLASH_SCREEN_NAME,

            WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME, *HOME_WINDOW_TITLE)



    @FlakyTest(bugId = 169271943)

    @Presubmit

    @Test

    fun dockedStackPrimaryBoundsIsVisible() =

        testSpec.dockedStackPrimaryBoundsIsVisible(testSpec.config.startRotation,

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterSplitScreenLaunchToSide.kt

+2 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.legacysplitscreen 


import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter
@@ -66,13 +65,13 @@ class EnterSplitScreenLaunchToSide( 
            secondaryApp.defaultWindowName, WindowManagerStateHelper.SPLASH_SCREEN_NAME,

            WindowManagerStateHelper.SNAPSHOT_WINDOW_NAME)



    @FlakyTest(bugId = 169271943)

    @Presubmit

    @Test

    fun dockedStackPrimaryBoundsIsVisible() =

        testSpec.dockedStackPrimaryBoundsIsVisible(testSpec.config.startRotation,

            splitScreenApp.defaultWindowName)



    @FlakyTest(bugId = 169271943)

    @Presubmit

    @Test

    fun dockedStackSecondaryBoundsIsVisible() =

        testSpec.dockedStackSecondaryBoundsIsVisible(testSpec.config.startRotation,
@@ -80,7 +79,6 @@ class EnterSplitScreenLaunchToSide( 


    @Presubmit

    @Test

    // b/169271943

    fun dockedStackDividerBecomesVisible() = testSpec.dockedStackDividerBecomesVisible()



    @Presubmit

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppAndEnterSplitScreen.kt

+2 −2
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ class RotateOneLaunchedAppAndEnterSplitScreen( 
            }

        }



    @FlakyTest(bugId = 175687842)

    @Presubmit

    @Test

    fun dockedStackDividerIsVisible() = testSpec.dockedStackDividerIsVisible()



    @FlakyTest(bugId = 175687842)

    @Presubmit

    @Test

    fun dockedStackPrimaryBoundsIsVisible() =

        testSpec.dockedStackPrimaryBoundsIsVisible(testSpec.config.startRotation,

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateOneLaunchedAppInSplitScreenMode.kt

+2 −2
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ class RotateOneLaunchedAppInSplitScreenMode( 
            }

        }



    @FlakyTest(bugId = 175687842)

    @Presubmit

    @Test

    fun dockedStackDividerIsVisible() = testSpec.dockedStackDividerIsVisible()



    @FlakyTest(bugId = 175687842)

    @Presubmit

    @Test

    fun dockedStackPrimaryBoundsIsVisible() = testSpec.dockedStackPrimaryBoundsIsVisible(

        testSpec.config.startRotation, splitScreenApp.defaultWindowName)