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

Commit 0a136a98 authored by Yuichiro Hanada's avatar Yuichiro Hanada
Browse files

Add the minimize button flag to the developer option 

Bug: 391748185
Flag: com.android.window.flags.enable_minimize_button
Test: presubmit
Change-Id: I08a9733628d4d7ea4c9495da7a0557f114eac7d0
parent 2802b72f

core/java/android/window/DesktopModeFlags.java

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ public enum DesktopModeFlags { 
    ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX(

            Flags::enableDesktopAppLaunchTransitionsBugfix, false),

    INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC(

            Flags::includeTopTransparentFullscreenTaskInDesktopHeuristic, true);

            Flags::includeTopTransparentFullscreenTaskInDesktopHeuristic, true),

    ENABLE_MINIMIZE_BUTTON(Flags::enableMinimizeButton, true);



    /**

     * Flag class, to be used in case the enum cannot be used because the flag is not accessible.

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecoration.java

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
            final RelayoutParams.OccludingCaptionElement controlsElement =

                    new RelayoutParams.OccludingCaptionElement();

            controlsElement.mWidthResId = R.dimen.desktop_mode_customizable_caption_margin_end;

            if (Flags.enableMinimizeButton()) {

            if (DesktopModeFlags.ENABLE_MINIMIZE_BUTTON.isTrue()) {

                controlsElement.mWidthResId =

                      R.dimen.desktop_mode_customizable_caption_with_minimize_button_margin_end;

            }

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/viewholder/AppHeaderViewHolder.kt

+2 −3
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import com.android.internal.R.color.materialColorSurfaceContainerHigh 
import com.android.internal.R.color.materialColorSurfaceContainerLow

import com.android.internal.R.color.materialColorSurfaceDim

import com.android.window.flags.Flags

import com.android.window.flags.Flags.enableMinimizeButton

import com.android.wm.shell.R

import android.window.DesktopModeFlags

import com.android.wm.shell.windowdecor.MaximizeButtonView
@@ -226,7 +225,7 @@ class AppHeaderViewHolder( 
            minimizeWindowButton.background = getDrawable(1)

        }

        maximizeButtonView.setAnimationTints(isDarkMode())

        minimizeWindowButton.isGone = !enableMinimizeButton()

        minimizeWindowButton.isGone = !DesktopModeFlags.ENABLE_MINIMIZE_BUTTON.isTrue()

    }



    private fun bindDataWithThemedHeaders(
@@ -276,7 +275,7 @@ class AppHeaderViewHolder( 
                drawableInsets = minimizeDrawableInsets

            )

        }

        minimizeWindowButton.isGone = !enableMinimizeButton()

        minimizeWindowButton.isGone = !DesktopModeFlags.ENABLE_MINIMIZE_BUTTON.isTrue()

        // Maximize button.

        maximizeButtonView.apply {

            setAnimationTints(