From 4f279bac321594173c6d54eb61d56a168b9adc08 Mon Sep 17 00:00:00 2001 From: Ats Jenk Date: Thu, 4 Aug 2022 15:55:03 -0700 Subject: [PATCH 1/2] Update flag constant for caption on shell System properties under persist.debug namespace can't be modified by SystemUI. aosp/I5808bf92dbba37e9e6da5559f8e0a5fdac016bf3 introduced a new namespace, persist.wm.debug that can be used for system properties that can be overridden from SystemUI. Move captions_on_shell to this namespace so we can update this flag from SystemUI to simplify enabling it on devices. Bug: 241464028 Test: build succeeds Change-Id: Ifcf54b6dfa70ca52dfb51fb2f7f2e67d0568566a --- core/java/android/view/ViewRootImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 7690af6931482..fa37ca1777365 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -276,7 +276,7 @@ public final class ViewRootImpl implements ViewParent, * @hide */ public static final boolean CAPTION_ON_SHELL = - SystemProperties.getBoolean("persist.debug.caption_on_shell", false); + SystemProperties.getBoolean("persist.wm.debug.caption_on_shell", false); /** * Whether the client should compute the window frame on its own. From 67b0353faa74f95ae566375ad64b660fe45a2b0a Mon Sep 17 00:00:00 2001 From: Ats Jenk Date: Fri, 5 Aug 2022 10:47:56 -0700 Subject: [PATCH 2/2] SysUI flags to support desktop windowing proto Add flag for enabling Desktop Windowing prototype. Expose captions_on_shell flag through SysUI flags so that we are able to toggle it through Flag Flipper app. Bug: 241464028 Test: build succeeds Change-Id: I0f77626388f88109bc14a8e448700cf16fe50d8b --- .../SystemUI/src/com/android/systemui/flags/Flags.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.java b/packages/SystemUI/src/com/android/systemui/flags/Flags.java index d4799883129e6..0e725a42b120b 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.java +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.java @@ -203,6 +203,14 @@ public class Flags { public static final SysPropBooleanFlag HIDE_NAVBAR_WINDOW = new SysPropBooleanFlag(1103, "persist.wm.debug.hide_navbar_window", false); + @Keep + public static final SysPropBooleanFlag WM_DESKTOP_WINDOWING = + new SysPropBooleanFlag(1104, "persist.wm.debug.desktop_mode", false); + + @Keep + public static final SysPropBooleanFlag WM_CAPTION_ON_SHELL = + new SysPropBooleanFlag(1105, "persist.wm.debug.caption_on_shell", false); + // 1200 - predictive back @Keep public static final SysPropBooleanFlag WM_ENABLE_PREDICTIVE_BACK = new SysPropBooleanFlag(