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

Commit 9d9beb3c authored by Garfield Tan's avatar Garfield Tan Committed by Automerger Merge Worker
Browse files

Merge "Hide CaptionDecorView behind CAPTION_ON_SHELL flag" into tm-dev am: 3bea7df5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17482725



Change-Id: I2eb713d9cc8f812c71dac7a190f2ca20fd8371eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 33f8098f 3bea7df5

core/java/android/view/ViewRootImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ public final class ViewRootImpl implements ViewParent, 
     * Whether the caption is drawn by the shell.

     * @hide

     */

    public static final boolean CAPTION_ON_SHELL = false;

    public static final boolean CAPTION_ON_SHELL =

            SystemProperties.getBoolean("persist.debug.caption_on_shell", false);



    /**

     * Whether the client should compute the window frame on its own.

core/java/com/android/internal/policy/DecorView.java

+2 −1
Original line number Diff line number Diff line
@@ -2259,7 +2259,8 @@ public class DecorView extends FrameLayout implements RootViewSurfaceTaker, Wind 
                attrs.type == TYPE_APPLICATION || attrs.type == TYPE_DRAWN_APPLICATION;

        final WindowConfiguration winConfig = getResources().getConfiguration().windowConfiguration;

        // Only a non floating application window on one of the allowed workspaces can get a caption

        if (!mWindow.isFloating() && isApplication && winConfig.hasWindowDecorCaption()) {

        if (!mWindow.isFloating() && isApplication && winConfig.hasWindowDecorCaption()

                && !CAPTION_ON_SHELL) {

            // Dependent on the brightness of the used title we either use the

            // dark or the light button frame.

            if (decorCaptionView == null) {