Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide windowing controls in proto1 caption menu" into udc-dev

Browse Source
This commit is contained in:
Jorge Gil
2023-03-22 20:37:07 +00:00
committed by Android (Google) Code Review
parent 2e49589c0c 9adff2515d
commit 196e62a84e
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/WindowManager/Shell/res/values/dimen.xml
View File

@@ -365,6 +365,7 @@
<dimen name="freeform_decor_caption_menu_width">256dp</dimen> <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">250dp</dimen>
<dimen name="freeform_decor_caption_menu_height_no_windowing_controls">210dp</dimen>
<dimen name="freeform_resize_handle">30dp</dimen> <dimen name="freeform_resize_handle">30dp</dimen>

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

@@ -33,6 +33,7 @@ import android.view.MotionEvent;
import android.view.SurfaceControl; import android.view.SurfaceControl;
import android.view.View; import android.view.View;
import android.view.ViewConfiguration; import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.window.WindowContainerTransaction; import android.window.WindowContainerTransaction;
@@ -69,6 +70,8 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
private RelayoutParams mRelayoutParams = new RelayoutParams(); private RelayoutParams mRelayoutParams = new RelayoutParams();
private final int mCaptionMenuHeightId = R.dimen.freeform_decor_caption_menu_height; 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 = private final WindowDecoration.RelayoutResult<WindowDecorLinearLayout> mResult =
new WindowDecoration.RelayoutResult<>(); new WindowDecoration.RelayoutResult<>();
@@ -227,11 +230,9 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
final View fullscreen = menu.findViewById(R.id.fullscreen_button); final View fullscreen = menu.findViewById(R.id.fullscreen_button);
fullscreen.setOnClickListener(mOnCaptionButtonClickListener); fullscreen.setOnClickListener(mOnCaptionButtonClickListener);
final View desktop = menu.findViewById(R.id.desktop_button); final View desktop = menu.findViewById(R.id.desktop_button);
if (DesktopModeStatus.isProto2Enabled()) { desktop.setOnClickListener(mOnCaptionButtonClickListener);
desktop.setOnClickListener(mOnCaptionButtonClickListener); final ViewGroup windowingBtns = menu.findViewById(R.id.windowing_mode_buttons);
} else if (DesktopModeStatus.isProto1Enabled()) { windowingBtns.setVisibility(DesktopModeStatus.isProto1Enabled() ? View.GONE : View.VISIBLE);
desktop.setVisibility(View.GONE);
}
final View split = menu.findViewById(R.id.split_screen_button); final View split = menu.findViewById(R.id.split_screen_button);
split.setOnClickListener(mOnCaptionButtonClickListener); split.setOnClickListener(mOnCaptionButtonClickListener);
final View close = menu.findViewById(R.id.close_button); final View close = menu.findViewById(R.id.close_button);
@@ -280,7 +281,9 @@ public class DesktopModeWindowDecoration extends WindowDecoration<WindowDecorLin
final int captionWidth = mTaskInfo.getConfiguration() final int captionWidth = mTaskInfo.getConfiguration()
.windowConfiguration.getBounds().width(); .windowConfiguration.getBounds().width();
final int menuWidth = loadDimensionPixelSize(resources, mHandleMenuWidthId); 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 shadowRadius = loadDimensionPixelSize(resources, mHandleMenuShadowRadiusId);
final int cornerRadius = loadDimensionPixelSize(resources, mHandleMenuCornerRadiusId); final int cornerRadius = loadDimensionPixelSize(resources, mHandleMenuCornerRadiusId);