From cf56d2b7cb687d1e4026c2bdf843efd07fd87719 Mon Sep 17 00:00:00 2001 From: Garfield Tan Date: Mon, 6 Feb 2023 10:48:03 -0800 Subject: [PATCH] Enable caption in shell by default Remove two caption insets related unit tests because new captions don't work so well with the old workaround. Proper fixes are in progress tracked by b/254128050. Bug: 266890800 Bug: 165794636 Test: Presubmit tests. Change-Id: Iaacd092a964d583579cea74bb863cbe85be230d2 --- core/java/android/view/ViewRootImpl.java | 2 +- .../src/android/view/InsetsSourceTest.java | 14 -------------- .../src/android/view/InsetsStateTest.java | 12 ------------ 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index d603de2333803..7f9099600c908 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -291,7 +291,7 @@ public final class ViewRootImpl implements ViewParent, * @hide */ public static final boolean CAPTION_ON_SHELL = - SystemProperties.getBoolean("persist.wm.debug.caption_on_shell", false); + SystemProperties.getBoolean("persist.wm.debug.caption_on_shell", true); /** * Whether the client should compute the window frame on its own. diff --git a/core/tests/coretests/src/android/view/InsetsSourceTest.java b/core/tests/coretests/src/android/view/InsetsSourceTest.java index 6fa8f11173438..1db6587e12836 100644 --- a/core/tests/coretests/src/android/view/InsetsSourceTest.java +++ b/core/tests/coretests/src/android/view/InsetsSourceTest.java @@ -19,7 +19,6 @@ package android.view; import static android.view.WindowInsets.Type.FIRST; import static android.view.WindowInsets.Type.LAST; import static android.view.WindowInsets.Type.SIZE; -import static android.view.WindowInsets.Type.captionBar; import static android.view.WindowInsets.Type.ime; import static android.view.WindowInsets.Type.navigationBars; @@ -52,13 +51,11 @@ public class InsetsSourceTest { private final InsetsSource mSource = new InsetsSource(0 /* id */, navigationBars()); private final InsetsSource mImeSource = new InsetsSource(1 /* id */, ime()); - private final InsetsSource mCaptionSource = new InsetsSource(2 /* id */, captionBar()); @Before public void setUp() { mSource.setVisible(true); mImeSource.setVisible(true); - mCaptionSource.setVisible(true); } @Test @@ -109,17 +106,6 @@ public class InsetsSourceTest { assertEquals(Insets.of(0, 0, 0, 100), insets); } - @Test - public void testCalculateInsets_caption_resizing() { - mCaptionSource.setFrame(new Rect(0, 0, 100, 100)); - Insets insets = mCaptionSource.calculateInsets(new Rect(0, 0, 200, 200), false); - assertEquals(Insets.of(0, 100, 0, 0), insets); - insets = mCaptionSource.calculateInsets(new Rect(0, 0, 50, 200), false); - assertEquals(Insets.of(0, 100, 0, 0), insets); - insets = mCaptionSource.calculateInsets(new Rect(100, 100, 200, 500), false); - assertEquals(Insets.of(0, 100, 0, 0), insets); - } - @Test public void testCalculateInsets_invisible() { mSource.setFrame(new Rect(0, 0, 500, 100)); diff --git a/core/tests/coretests/src/android/view/InsetsStateTest.java b/core/tests/coretests/src/android/view/InsetsStateTest.java index fde1a6d7b04c4..b035c23cb98b7 100644 --- a/core/tests/coretests/src/android/view/InsetsStateTest.java +++ b/core/tests/coretests/src/android/view/InsetsStateTest.java @@ -247,18 +247,6 @@ public class InsetsStateTest { assertEquals(Insets.of(0, 300, 0, 0), visibleInsets); } - @Test - public void testCalculateInsets_captionBarOffset() { - mState.getOrCreateSource(ID_CAPTION_BAR, captionBar()) - .setFrame(new Rect(0, 0, 100, 300)) - .setVisible(true); - - Insets visibleInsets = mState.calculateVisibleInsets( - new Rect(0, 0, 150, 400), TYPE_APPLICATION, WINDOWING_MODE_UNDEFINED, - SOFT_INPUT_ADJUST_NOTHING, 0 /* windowFlags */); - assertEquals(Insets.of(0, 300, 0, 0), visibleInsets); - } - @Test public void testCalculateInsets_extraNavRightStatusTop() { mState.getOrCreateSource(ID_STATUS_BAR, statusBars())