commit 0bcf2711bfed17e5552e2a8cfa9ebf87b900f3b6
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jan 24 15:23:44 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 24 15:23:44 2023 +0000
tree 6d3588396413cbc0920a3c6bd84a2130c46cdcc3
parent 3c5b03e99e26189998fd821bb72d9e37bee9d809
parent 79b9075e6710ffea7a85cb6370d3d7aceaeffa38

Merge "Disable navigation bar related tests on tablet" into android12L-dev

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

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java
index 054da4c..4ee96f0 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java
@@ -17,6 +17,7 @@
 package android.server.wm;
 
 import static android.graphics.PixelFormat.TRANSLUCENT;
+import static android.server.wm.ActivityManagerTestBase.isTablet;
 import static android.view.KeyEvent.ACTION_DOWN;
 import static android.view.KeyEvent.KEYCODE_BACK;
 import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;
@@ -360,6 +361,9 @@
         final int[] targetSysUiVis = new int[1];
         final View nonControlTarget = new View(mTargetContext);
         final int[] nonTargetSysUiVis = new int[1];
+        if (isTablet()) {
+            return;
+        }
         final WindowManager.LayoutParams nonTargetAttrs =
                 new WindowManager.LayoutParams(TYPE_APPLICATION);
         nonTargetAttrs.flags = FLAG_NOT_FOCUSABLE;