Add assumeTrue to test using navigation bars
Not all devices have navigation bars.
Fix: 160443927
Test: atest WindowInsetsAnimationImeTests
Test: atest WindowInsetsAnimationTests
Change-Id: I4643a13c62ef744ee76e04690bd4c779329fbcc2
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationImeTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationImeTests.java
index 373e1e5..3668172 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationImeTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationImeTests.java
@@ -93,6 +93,8 @@
@Test
@FlakyTest(detail = "Promote once confirmed non-flaky")
public void testAnimationCallbacks_overlapping_opposite() throws Exception {
+ assumeTrue(hasWindowInsets(navigationBars()));
+
initActivity(false /* useFloating */);
WindowInsets before = mActivity.mLastWindowInsets;
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationTestBase.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationTestBase.java
index af8ed0b..ebcc34a 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationTestBase.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationTestBase.java
@@ -34,6 +34,7 @@
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.spy;
+import android.graphics.Insets;
import android.os.Bundle;
import android.os.SystemClock;
import android.server.wm.WindowInsetsAnimationTestBase.AnimCallback.AnimationStep;
@@ -103,6 +104,10 @@
assertEquals(after, steps.get(steps.size() - 1).insets);
}
+ protected boolean hasWindowInsets(int types) {
+ return Insets.NONE != mRootView.getRootWindowInsets().getInsetsIgnoringVisibility(types);
+ }
+
protected void assertAnimationSteps(ArrayList<AnimationStep> steps, boolean showAnimation) {
assertTrue(steps.size() >= 2);
assertEquals(0f, steps.get(0).fraction, 0f);
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationTests.java
index 23fabe7..0a471a6 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationTests.java
@@ -38,7 +38,6 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.withSettings;
-import android.graphics.Insets;
import android.platform.test.annotations.Presubmit;
import android.view.View;
import android.view.WindowInsets;
@@ -69,10 +68,6 @@
assumeTrue(hasWindowInsets(systemBars()));
}
- private boolean hasWindowInsets(int types) {
- return Insets.NONE != mRootView.getRootWindowInsets().getInsetsIgnoringVisibility(types);
- }
-
@Test
public void testAnimationCallbacksHide() {
WindowInsets before = mActivity.mLastWindowInsets;
