From 5a68f5cd91bdd8967b61d6619332e5d60c303b91 Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Tue, 8 Feb 2022 22:54:11 +0800
Subject: [PATCH] Add default theme for flicker test app

Otherwise its WidowManager.LayoutParams#windowAnimations is 0, then
it won't play animation (TransitionAnimation#loadAnimationAttr
returns null) so the the surface of closing app may be updated to
invisible at random timing that causes the test flaky.

Use darker gray as window background color to make it easier to
distinguish the visual result between home, starting window (gray)
and app content (orange).

Bug: 216297992
Bug: 213852103
Test: com.android.server.wm.flicker.launch.OpenAppColdTest
Change-Id: I3bb073dfa52484a63168b3aeb6e7f5f43bd02aac
---
 .../flicker/test-apps/flickerapp/res/values/styles.xml | 10 +++++++---
 .../test-apps/flickerapp/res/values/styles.xml         | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/libs/WindowManager/Shell/tests/flicker/test-apps/flickerapp/res/values/styles.xml b/libs/WindowManager/Shell/tests/flicker/test-apps/flickerapp/res/values/styles.xml
index 87a61a88c0945..23b51cc06f04b 100644
--- a/libs/WindowManager/Shell/tests/flicker/test-apps/flickerapp/res/values/styles.xml
+++ b/libs/WindowManager/Shell/tests/flicker/test-apps/flickerapp/res/values/styles.xml
@@ -16,15 +16,19 @@
   -->
 
 <resources>
-    <style name="CutoutDefault">
+    <style name="DefaultTheme" parent="@android:style/Theme.DeviceDefault">
+        <item name="android:windowBackground">@android:color/darker_gray</item>
+    </style>
+
+    <style name="CutoutDefault" parent="@style/DefaultTheme">
         <item name="android:windowLayoutInDisplayCutoutMode">default</item>
     </style>
 
-    <style name="CutoutShortEdges">
+    <style name="CutoutShortEdges" parent="@style/DefaultTheme">
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 
-    <style name="CutoutNever">
+    <style name="CutoutNever" parent="@style/DefaultTheme">
         <item name="android:windowLayoutInDisplayCutoutMode">never</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml b/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml
index 746b0f4ca7e11..589df38eec832 100644
--- a/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml
+++ b/tests/FlickerTests/test-apps/flickerapp/res/values/styles.xml
@@ -16,15 +16,19 @@
   -->
 
 <resources>
-    <style name="CutoutDefault">
+    <style name="DefaultTheme" parent="@android:style/Theme.DeviceDefault">
+        <item name="android:windowBackground">@android:color/darker_gray</item>
+    </style>
+
+    <style name="CutoutDefault" parent="@style/DefaultTheme">
         <item name="android:windowLayoutInDisplayCutoutMode">default</item>
     </style>
 
-    <style name="CutoutShortEdges">
+    <style name="CutoutShortEdges" parent="@style/DefaultTheme">
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
 
-    <style name="CutoutNever">
+    <style name="CutoutNever" parent="@style/DefaultTheme">
         <item name="android:windowLayoutInDisplayCutoutMode">never</item>
     </style>