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

Commit 13be234c authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Hide windowing controls in proto1 caption menu" into udc-dev am: 196e62a8 

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



Change-Id: I6d4d9d622a409de882275c3cf6318b6961b89e1e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c51f44ee 196e62a8

libs/WindowManager/Shell/res/values/dimen.xml

+1 −0
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ 
    <dimen name="freeform_decor_caption_menu_width">256dp</dimen>



    <dimen name="freeform_decor_caption_menu_height">250dp</dimen>

    <dimen name="freeform_decor_caption_menu_height_no_windowing_controls">210dp</dimen>



    <dimen name="freeform_resize_handle">30dp</dimen>

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

+9 −6
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.view.MotionEvent; 
import android.view.SurfaceControl;

import android.view.View;

import android.view.ViewConfiguration;

import android.view.ViewGroup;

import android.widget.ImageView;

import android.widget.TextView;

import android.window.WindowContainerTransaction;
@@ -69,6 +70,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 


    private RelayoutParams mRelayoutParams = new RelayoutParams();

    private final int mCaptionMenuHeightId = R.dimen.freeform_decor_caption_menu_height;

    private final int mCaptionMenuHeightWithoutWindowingControlsId =

            R.dimen.freeform_decor_caption_menu_height_no_windowing_controls;

    private final WindowDecoration.RelayoutResult<WindowDecorLinearLayout> mResult =

            new WindowDecoration.RelayoutResult<>();
@@ -227,11 +230,9 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        final View fullscreen = menu.findViewById(R.id.fullscreen_button);

        fullscreen.setOnClickListener(mOnCaptionButtonClickListener);

        final View desktop = menu.findViewById(R.id.desktop_button);

        if (DesktopModeStatus.isProto2Enabled()) {

        desktop.setOnClickListener(mOnCaptionButtonClickListener);

        } else if (DesktopModeStatus.isProto1Enabled()) {

            desktop.setVisibility(View.GONE);

        }

        final ViewGroup windowingBtns = menu.findViewById(R.id.windowing_mode_buttons);

        windowingBtns.setVisibility(DesktopModeStatus.isProto1Enabled() ? View.GONE : View.VISIBLE);

        final View split = menu.findViewById(R.id.split_screen_button);

        split.setOnClickListener(mOnCaptionButtonClickListener);

        final View close = menu.findViewById(R.id.close_button);
@@ -280,7 +281,9 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin 
        final int captionWidth = mTaskInfo.getConfiguration()

                .windowConfiguration.getBounds().width();

        final int menuWidth = loadDimensionPixelSize(resources, mHandleMenuWidthId);

        final int menuHeight = loadDimensionPixelSize(resources, mCaptionMenuHeightId);

        // The windowing controls are disabled in proto1.

        final int menuHeight = loadDimensionPixelSize(resources, DesktopModeStatus.isProto1Enabled()

                ? mCaptionMenuHeightWithoutWindowingControlsId : mCaptionMenuHeightId);

        final int shadowRadius = loadDimensionPixelSize(resources, mHandleMenuShadowRadiusId);

        final int cornerRadius = loadDimensionPixelSize(resources, mHandleMenuCornerRadiusId);