Merge "Skip forwardInset with adjustResize test for IME insets"

2020-01-07 20:47:57 +00:00
parent e675490df5 24f04668de
commit ff2fc36979
1 changed files with 2 additions and 0 deletions
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java
@@ -594,6 +594,8 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase {

    @Test
    public void layoutWindowLw_withForwardInset_SoftInputAdjustResize() {
+        assumeTrue(ViewRootImpl.sNewInsetsMode == ViewRootImpl.NEW_INSETS_MODE_NONE);
+
        mWindow.mAttrs.flags =
                FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
        mWindow.mAttrs.softInputMode = SOFT_INPUT_ADJUST_RESIZE;