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

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

Merge "Disable split screen tests at 90 degrees" into sc-dev

parents f7310615 c21bbe24

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

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


import android.os.Bundle

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerTestRunner
@@ -47,6 +48,7 @@ import org.junit.runners.Parameterized 
@RequiresDevice

@RunWith(Parameterized::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

// @FlakyTest(bugId = 179116910)

class EnterSplitScreenDockActivity(

    testSpec: FlickerTestRunnerFactory.TestSpec

) : FlickerTestRunner(testSpec) {
@@ -92,7 +94,9 @@ class EnterSplitScreenDockActivity( 
            }

            return FlickerTestRunnerFactory.getInstance().buildTest(

                instrumentation, defaultTransitionSetup, testSpec,

                repetitions = SplitScreenHelper.TEST_REPETITIONS)

                repetitions = SplitScreenHelper.TEST_REPETITIONS,

                supportedRotations = listOf(Surface.ROTATION_0) // bugId = 179116910

            )

        }

    }

}
 
 No newline at end of file

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

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


import android.os.Bundle

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerTestRunner
@@ -96,7 +97,9 @@ class EnterSplitScreenLaunchToSide( 
            }

            return FlickerTestRunnerFactory.getInstance().buildTest(

                instrumentation, defaultTransitionSetup, testSpec,

                repetitions = SplitScreenHelper.TEST_REPETITIONS)

                repetitions = SplitScreenHelper.TEST_REPETITIONS,

                supportedRotations = listOf(Surface.ROTATION_0) // bugId = 175687842

            )

        }

    }

}
 
 No newline at end of file

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

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


import android.os.Bundle

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.DOCKED_STACK_DIVIDER
@@ -86,7 +87,9 @@ class ExitLegacySplitScreenFromBottom( 
            }

            return FlickerTestRunnerFactory.getInstance().buildTest(

                instrumentation, defaultTransitionSetup, testSpec,

                repetitions = SplitScreenHelper.TEST_REPETITIONS)

                repetitions = SplitScreenHelper.TEST_REPETITIONS,

                supportedRotations = listOf(Surface.ROTATION_0) // bugId = 175687842

            )

        }

    }

}
 
 No newline at end of file

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

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



import android.os.Bundle

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerTestRunner
@@ -87,7 +88,9 @@ class ExitPrimarySplitScreenShowSecondaryFullscreen( 
            }

            return FlickerTestRunnerFactory.getInstance().buildTest(

                instrumentation, defaultTransitionSetup, testSpec,

                repetitions = SplitScreenHelper.TEST_REPETITIONS)

                repetitions = SplitScreenHelper.TEST_REPETITIONS,

                supportedRotations = listOf(Surface.ROTATION_0) // bugId = 179116910

            )

        }

    }

}

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

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


import android.os.Bundle

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerTestRunner
@@ -93,7 +94,9 @@ class OpenAppToLegacySplitScreen( 
            }

            return FlickerTestRunnerFactory.getInstance().buildTest(

                instrumentation, defaultTransitionSetup, testSpec,

                repetitions = SplitScreenHelper.TEST_REPETITIONS)

                repetitions = SplitScreenHelper.TEST_REPETITIONS,

                supportedRotations = listOf(Surface.ROTATION_0) // bugId = 179116910

            )

        }

    }

}