Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c6d6b52 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "desktop-windowing-flags" into tm-qpr-dev 

* changes:
  SysUI flags to support desktop windowing proto
  Update flag constant for caption on shell
parents 4c5ec987 67b0353f

core/java/android/view/ViewRootImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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.

packages/SystemUI/src/com/android/systemui/flags/Flags.java

+8 −0
Original line number Diff line number Diff line
@@ -207,6 +207,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(