commit b8a28077bee3413a08f944c82809596d5abfed8c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 10 19:09:40 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 10 19:09:40 2020 +0000
tree 236fc9f5f858e3cf1167428837f82632e2e34da3
parent 27358bdf67dbdb345d9278f34b7859ed8fd55715
parent 93d4ee88bf4651d27ddd09a05c609b8ea09dfa42

Merge "Fix the logics to be more flexible in assertSizeAreSane for CtsWindowManagerDeviceTestCases"

tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java b/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java
index 5adb97f..191a70b 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java
@@ -888,7 +888,10 @@
      * that are smaller than the dockedSizes.
      */
     private static void assertSizesAreSane(SizeInfo fullscreenSizes, SizeInfo dockedSizes) {
-        if (isDisplayPortrait()) {
+        final boolean isHorizontalDivision =
+                fullscreenSizes.displayHeight - dockedSizes.displayHeight >
+                fullscreenSizes.displayWidth - dockedSizes.displayWidth;
+        if (isHorizontalDivision) {
             assertThat(dockedSizes.displayHeight, lessThan(fullscreenSizes.displayHeight));
             assertThat(dockedSizes.heightDp, lessThan(fullscreenSizes.heightDp));
             assertThat(dockedSizes.metricsHeight, lessThan(fullscreenSizes.metricsHeight));