Merge "Revert "Set cutout mode to shortEdges on flicker"" into main (c67c79e3) · Commits · e / os / android_frameworks_base

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

+0 −14

Original line number	Diff line number	Diff line
		@@ -156,19 +156,6 @@ 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")
		@@ -225,7 +212,6 @@ class SeamlessAppRotationTest(flicker: LegacyFlickerTest) : RotationTransition(f
		visibleLayersShownMoreThanOneConsecutiveEntry()
		visibleWindowsShownMoreThanOneConsecutiveEntry()

		runAndIgnoreAssumptionViolation { appLayerRotates() }
		runAndIgnoreAssumptionViolation { appLayerAlwaysVisible() }
		runAndIgnoreAssumptionViolation { navBarLayerIsVisibleAtStartAndEnd() }
		runAndIgnoreAssumptionViolation { navBarWindowIsAlwaysVisible() }

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

+1 −26

Original line number	Diff line number	Diff line
		@@ -39,7 +39,6 @@
		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>
		@@ -49,7 +48,6 @@
		</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>
		@@ -58,7 +56,6 @@
		</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"
		@@ -81,7 +78,6 @@
		</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"
		@@ -92,7 +88,6 @@
		</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"
		@@ -174,7 +169,6 @@
		</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">
		@@ -185,7 +179,6 @@
		</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">
		@@ -207,7 +200,6 @@
		</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">
		@@ -219,7 +211,6 @@
		<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>
		@@ -229,7 +220,6 @@
		</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"
		@@ -241,7 +231,6 @@
		</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">
		@@ -254,7 +243,6 @@
		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>
		@@ -266,7 +254,6 @@
		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>
		@@ -274,7 +261,6 @@
		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"/>
		@@ -282,21 +268,18 @@
		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>
		@@ -304,7 +287,6 @@
		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"
		@@ -334,7 +316,6 @@
		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">
		@@ -350,7 +331,6 @@
		<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>
		@@ -371,7 +351,6 @@
		<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">
		@@ -383,7 +362,6 @@
		<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">
		@@ -396,7 +374,6 @@
		</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>
		@@ -408,7 +385,6 @@
		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"/>
		@@ -420,7 +396,6 @@
		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

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		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

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		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

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		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>