commit 85dd96c68efb9cfd37ec2d747d832213d89cd520
author Jorim Jaggi <jjaggi@google.com> Wed Jan 29 13:14:56 2020 +0100
committer Jorim Jaggi <jjaggi@google.com> Thu Jan 30 18:31:21 2020 +0100
tree fc9e478c19136e99f0530ea4d7612da9fd198ef9
parent cbee36fd9f7b4a37f211869edcaa29768d71ca57

Adjust CTS for setDecorFitsSystemWindows

Test: self
Bug: 143556682
Bug: 118118435
Change-Id: I51b2c6566fae81f2d4610cf01168377057bd12ea

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

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
index 26adbe6..3c86182 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
@@ -39,7 +39,6 @@
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.graphics.Insets;
 import android.graphics.PixelFormat;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -53,7 +52,6 @@
 import android.server.wm.cts.R;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.util.Pair;
 import android.view.ContextThemeWrapper;
 import android.view.Display;
 import android.view.Gravity;
@@ -68,7 +66,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.view.WindowInsets.Type;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
@@ -641,22 +638,15 @@
     }
 
     @Test
-    public void testSetOnContentApplyWindowInsetsListener() throws Throwable {
-        Insets[] navBarInsets = new Insets[1];
-        mActivityRule.runOnUiThread(() -> mWindow.setOnContentApplyWindowInsetsListener(insets -> {
-            Insets statusBarInset = insets.getInsets(Type.statusBars());
-            navBarInsets[0] = insets.getInsets(Type.navigationBars());
-            insets = insets.inset(statusBarInset.left, statusBarInset.top,
-                    statusBarInset.right, statusBarInset.bottom);
-            return new Pair<>(statusBarInset, insets);
-        }));
+    public void testSetFitsContentForInsets_false() throws Throwable {
+        mActivityRule.runOnUiThread(() -> mWindow.setDecorFitsSystemWindows(false));
         mInstrumentation.waitForIdleSync();
-        assertEquals(Insets.NONE, mActivity.getLastInsets().getInsets(Type.statusBars()));
-        assertEquals(navBarInsets[0], mActivity.getLastInsets().getInsets(Type.navigationBars()));
+        assertEquals(mActivity.getContentView().getRootWindowInsets().getSystemWindowInsets(),
+                mActivity.getLastInsets().getSystemWindowInsets());
     }
 
     @Test
-    public void testSetOnContentApplyWindowInsetsListener_defaultLegacy_sysuiFlags()
+    public void testSetFitsContentForInsets_defaultLegacy_sysuiFlags()
             throws Throwable {
         mActivityRule.runOnUiThread(() -> {
             mWindow.getDecorView().setSystemUiVisibility(SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
@@ -667,10 +657,24 @@
     }
 
     @Test
-    public void testSetOnContentApplyWindowInsetsListener_defaultLegacy_none()
+    public void testSetFitsContentForInsets_defaultLegacy_none()
             throws Throwable {
         mInstrumentation.waitForIdleSync();
-        assertEquals(Insets.NONE, mActivity.getLastInsets().getInsets(Type.systemBars()));
+
+        // We don't expect that we even got called.
+        assertNull(mActivity.getLastInsets());
+    }
+
+    @Test
+    public void testSetFitsContentForInsets_true()
+            throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mWindow.setDecorFitsSystemWindows(true);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        // We don't expect that we even got called.
+        assertNull(mActivity.getLastInsets());
     }
 
     /**
@@ -1018,15 +1022,5 @@
         public int getNavigationBarColor() {
             return 0;
         }
-
-        @Override
-        public void setOnContentApplyWindowInsetsListener(
-                OnContentApplyWindowInsetsListener onContentApplyWindowInsetsListener) {
-        }
-
-        @Override
-        public void resetOnContentApplyWindowInsetsListener() {
-
-        }
     }
 }