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

Commit 0af8292b authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Revert^2 "Set cutout mode to shortEdges on flicker" 

This reverts commit 4f4bb9a0.

Reason for revert: Droidmonitor created revert due to b/400479142. Will be verifying through ABTD before submission.

Change-Id: I82c7bbaa61ae96b6a39fe2bdef54fc912079c1ed
parent 4f4bb9a0

tests/FlickerTests/Rotation/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt

+14 −0
Original line number Diff line number Diff line
@@ -156,6 +156,19 @@ class SeamlessAppRotationTest(flicker: LegacyFlickerTest) : RotationTransition(f 
        flicker.assertLayers { isVisible(testApp) }

    }



    /** Checks that [testApp] layer covers the entire screen during the whole transition */

    @Presubmit

    @Test

    fun appLayerRotates() {

        flicker.assertLayers {

            this.invoke("entireScreenCovered") { entry ->

                entry.entry.displays.map { display ->

                    entry.visibleRegion(testApp).coversExactly(display.layerStackSpace)

                }

            }

        }

    }



    /** {@inheritDoc} */

    @Test

    @Ignore("Not applicable to this CUJ. App is full screen")
@@ -212,6 +225,7 @@ class SeamlessAppRotationTest(flicker: LegacyFlickerTest) : RotationTransition(f 
        visibleLayersShownMoreThanOneConsecutiveEntry()

        visibleWindowsShownMoreThanOneConsecutiveEntry()



        runAndIgnoreAssumptionViolation { appLayerRotates() }

        runAndIgnoreAssumptionViolation { appLayerAlwaysVisible() }

        runAndIgnoreAssumptionViolation { navBarLayerIsVisibleAtStartAndEnd() }

        runAndIgnoreAssumptionViolation { navBarWindowIsAlwaysVisible() }

tests/FlickerTests/test-apps/flickerapp/AndroidManifest.xml

+26 −1
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
            android:value="true" />

        <activity android:name=".SimpleActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.SimpleActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:label="SimpleActivity"

                  android:exported="true">

            <intent-filter>
@@ -48,6 +49,7 @@ 
        </activity>

        <activity android:name=".ImeActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.ImeActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:label="ImeActivity"

                  android:exported="true">

            <intent-filter>
@@ -56,6 +58,7 @@ 
            </intent-filter>

        </activity>

        <activity android:name=".ImeActivityAutoFocus"

                  android:theme="@style/CutoutShortEdges"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.ImeActivityAutoFocus"

                  android:windowSoftInputMode="stateVisible"

                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
@@ -78,6 +81,7 @@ 
        </activity>

        <activity android:name=".SeamlessRotationActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.SeamlessRotationActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize"

                  android:showWhenLocked="true"

                  android:label="SeamlessActivity"
@@ -88,6 +92,7 @@ 
            </intent-filter>

        </activity>

        <activity android:name=".NonResizeableActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:resizeableActivity="false"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.NonResizeableActivity"

                  android:label="NonResizeableActivity"
@@ -169,6 +174,7 @@ 
        </activity>

        <activity android:name=".LaunchNewActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.LaunchNewActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:configChanges="orientation|screenSize"

                  android:label="LaunchNewActivity"

                  android:exported="true">
@@ -179,6 +185,7 @@ 
        </activity>

        <activity android:name=".LaunchNewTaskActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.LaunchNewTaskActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:configChanges="orientation|screenSize"

                  android:label="LaunchNewTaskActivity"

                  android:exported="true">
@@ -200,6 +207,7 @@ 
        </activity>

        <activity android:name=".PortraitOnlyActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.PortraitOnlyActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:screenOrientation="portrait"

                  android:configChanges="orientation|screenSize"

                  android:exported="true">
@@ -211,6 +219,7 @@ 
        <activity android:name=".ImeEditorPopupDialogActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.ImeEditorPopupDialogActivity"

                  android:configChanges="orientation|screenSize"

                  android:theme="@style/CutoutShortEdges"

                  android:label="ImeEditorPopupDialogActivity"

                  android:exported="true">

            <intent-filter>
@@ -220,6 +229,7 @@ 
        </activity>

        <activity android:name=".ShowWhenLockedActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.ShowWhenLockedActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:configChanges="orientation|screenSize"

                  android:label="ShowWhenLockedActivity"

                  android:showWhenLocked="true"
@@ -231,6 +241,7 @@ 
        </activity>

        <activity android:name=".NotificationActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.NotificationActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:configChanges="orientation|screenSize"

                  android:label="NotificationActivity"

                  android:exported="true">
@@ -243,6 +254,7 @@ 
            android:name=".ActivityEmbeddingMainActivity"

            android:label="ActivityEmbedding Main"

            android:taskAffinity="com.android.server.wm.flicker.testapp.ActivityEmbedding"

            android:theme="@style/CutoutShortEdges"

            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"

            android:exported="true">

            <intent-filter>
@@ -254,6 +266,7 @@ 
            android:name=".ActivityEmbeddingTrampolineActivity"

            android:label="ActivityEmbedding Trampoline"

            android:taskAffinity="com.android.server.wm.flicker.testapp.ActivityEmbedding"

            android:theme="@style/CutoutShortEdges"

            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"

            android:exported="false">

        </activity>
@@ -261,6 +274,7 @@ 
            android:name=".ActivityEmbeddingSecondaryActivity"

            android:label="ActivityEmbedding Secondary"

            android:taskAffinity="com.android.server.wm.flicker.testapp.ActivityEmbedding"

            android:theme="@style/CutoutShortEdges"

            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"

            android:supportsPictureInPicture="true"

            android:exported="false"/>
@@ -268,18 +282,21 @@ 
            android:name=".ActivityEmbeddingThirdActivity"

            android:label="ActivityEmbedding Third"

            android:taskAffinity="com.android.server.wm.flicker.testapp.ActivityEmbedding"

            android:theme="@style/CutoutShortEdges"

            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"

            android:exported="false"/>

        <activity

            android:name=".ActivityEmbeddingAlwaysExpandActivity"

            android:label="ActivityEmbedding AlwaysExpand"

            android:taskAffinity="com.android.server.wm.flicker.testapp.ActivityEmbedding"

            android:theme="@style/CutoutShortEdges"

            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"

            android:exported="false"/>

        <activity

            android:name=".ActivityEmbeddingPlaceholderPrimaryActivity"

            android:label="ActivityEmbedding Placeholder Primary"

            android:taskAffinity="com.android.server.wm.flicker.testapp.ActivityEmbedding"

            android:theme="@style/CutoutShortEdges"

            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"

            android:exported="false">

        </activity>
@@ -287,6 +304,7 @@ 
            android:name=".ActivityEmbeddingPlaceholderSecondaryActivity"

            android:label="ActivityEmbedding Placeholder Secondary"

            android:taskAffinity="com.android.server.wm.flicker.testapp.ActivityEmbedding"

            android:theme="@style/CutoutShortEdges"

            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"

            android:exported="false"/>

        <activity android:name=".MailActivity"
@@ -316,6 +334,7 @@ 
                  android:supportsPictureInPicture="true"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.PipActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:launchMode="singleTop"

                  android:label="PipActivity"

                  android:exported="true">
@@ -331,6 +350,7 @@ 
        <activity android:name=".BottomHalfPipLaunchingActivity"

            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"

            android:taskAffinity="com.android.server.wm.flicker.testapp.BottomHalfPipLaunchingActivity"

            android:theme="@style/CutoutShortEdges"

            android:label="BottomHalfPipLaunchingActivity"

            android:exported="true">

            <intent-filter>
@@ -351,6 +371,7 @@ 
        <activity android:name=".SplitScreenActivity"

                  android:resizeableActivity="true"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.SplitScreenActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:label="SplitScreenPrimaryActivity"

                  android:exported="true"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
@@ -362,6 +383,7 @@ 
        <activity android:name=".SplitScreenSecondaryActivity"

                  android:resizeableActivity="true"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.SplitScreenSecondaryActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:label="SplitScreenSecondaryActivity"

                  android:exported="true"

                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
@@ -374,6 +396,7 @@ 
        </activity>

        <activity android:name=".SendNotificationActivity"

                  android:taskAffinity="com.android.server.wm.flicker.testapp.SendNotificationActivity"

                  android:theme="@style/CutoutShortEdges"

                  android:label="SendNotificationActivity"

                  android:exported="true">

            <intent-filter>
@@ -385,6 +408,7 @@ 
            android:name=".LaunchBubbleActivity"

            android:label="LaunchBubbleActivity"

            android:exported="true"

            android:theme="@style/CutoutShortEdges"

            android:launchMode="singleTop">

            <intent-filter>

                <action android:name="android.intent.action.MAIN"/>
@@ -396,6 +420,7 @@ 
            android:name=".BubbleActivity"

            android:label="BubbleActivity"

            android:exported="false"

            android:theme="@style/CutoutShortEdges"

            android:resizeableActivity="true"/>

        <activity

            android:name=".TransferSplashscreenActivity"

tests/FlickerTests/test-apps/flickerapp/res/layout/activity_ime.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@android:color/holo_green_light"

    android:fitsSystemWindows="true"

    android:focusableInTouchMode="true"

    android:orientation="vertical">

tests/FlickerTests/test-apps/flickerapp/res/layout/activity_mail.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"

    android:fitsSystemWindows="true"

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    <fragment

tests/FlickerTests/test-apps/flickerapp/res/layout/activity_simple.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true"

    android:background="@android:color/holo_orange_light">



</LinearLayout>