diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-27 21:49:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-27 21:49:58 +0000 |
| commit | 9b64856d704a05dc2b72f4898b96de5dbefc8793 (patch) | |
| tree | 3361b8fe80d5237fe88507b7a482b10b075848a5 | |
| parent | 92884fb14b0cb133a5f8256e81b8d417e4be6d3b (diff) | |
| parent | 820f89b19761e0db6ca1aff192761cc294a3e955 (diff) | |
| download | cts-9b64856d704a05dc2b72f4898b96de5dbefc8793.tar.gz | |
Merge "Fix PixelCopyTest CTS issue" into android12L-tests-dev
| -rw-r--r-- | tests/tests/view/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tests/tests/view/res/values/styles.xml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/tests/view/AndroidManifest.xml b/tests/tests/view/AndroidManifest.xml index a892da1d6cc..6de3aac86d3 100644 --- a/tests/tests/view/AndroidManifest.xml +++ b/tests/tests/view/AndroidManifest.xml @@ -203,7 +203,7 @@ android:label="PixelCopyViewProducerDialogActivity" android:screenOrientation="portrait" android:rotationAnimation="jumpcut" - android:theme="@android:style/Theme.Material.Dialog.NoActionBar" + android:theme="@style/PixelCopyViewProducerDialogActivityTheme" android:configChanges="orientation|screenSize|screenLayout|smallestScreenSize"/> <activity android:name="android.view.cts.FocusFinderCtsActivity" diff --git a/tests/tests/view/res/values/styles.xml b/tests/tests/view/res/values/styles.xml index bb513bfc73a..34df7cce0df 100644 --- a/tests/tests/view/res/values/styles.xml +++ b/tests/tests/view/res/values/styles.xml @@ -184,6 +184,10 @@ <item name="android:windowAnimationStyle">@null</item> </style> + <style name="PixelCopyViewProducerDialogActivityTheme" parent="@android:style/Theme.Material.Dialog.NoActionBar"> + <item name="android:windowLayoutInDisplayCutoutMode">default</item> + </style> + <style name="ViewAttributeTestTheme" parent="@android:Theme.Material"/> <style name="ExplicitStyle1" parent="@style/ParentOfExplicitStyle1"> |