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

Commit 7ade22ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I3439a096,I2421e2d3 into main 

* changes:
  Add missing @Test annotations
  Remove accidentely kept @Presubmit annotation
parents 0bd5f078 ff2c76b3

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

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.wm.shell.flicker.pip



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.LegacyFlickerTest
@@ -68,7 +67,6 @@ class MovePipDownOnShelfHeightChange(flicker: LegacyFlickerTest) : 


    /** Checks that the visible region of [pipApp] layer always moves down during the animation. */

    @FlakyTest(bugId = 292813143)

    @Presubmit

    @Test

    fun pipLayerMovesDown() = pipLayerMoves(Direction.DOWN)

}

tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -67,9 +67,11 @@ class HorizontalSplitChangeRatioTest(flicker: LegacyFlickerTest) : 
    }



    @FlakyTest(bugId = 293075402)

    @Test

    override fun backgroundLayerNeverVisible() = super.backgroundLayerNeverVisible()



    @FlakyTest(bugId = 293075402)

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()