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

Commit 285a32f1 authored by Ats Jenk's avatar Ats Jenk
Browse files

Update expanded view drop target size 

The drop target does not have uniform padding on all edges.
Update based on latest spec.

Bug: 388856523
Test: atest DesktopModeVisualIndicatorTest
Flag: com.android.wm.shell.enable_bubble_to_fullscreen
Change-Id: Iba46fe055e63ec978555330c63c4ecc5d8f24a21
parent e65271a8

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

+3 −0
Original line number Diff line number Diff line
@@ -291,6 +291,9 @@ 
    <!-- Corner radius for expanded view drop target -->

    <dimen name="bubble_bar_expanded_view_drop_target_corner">28dp</dimen>

    <dimen name="bubble_bar_expanded_view_drop_target_padding">24dp</dimen>

    <dimen name="bubble_bar_expanded_view_drop_target_padding_top">60dp</dimen>

    <dimen name="bubble_bar_expanded_view_drop_target_padding_bottom">24dp</dimen>

    <dimen name="bubble_bar_expanded_view_drop_target_padding_horizontal">48dp</dimen>

    <!-- Width of the box around bottom center of the screen where drag only leads to dismiss -->

    <dimen name="bubble_bar_dismiss_zone_width">192dp</dimen>

    <!-- Height of the box around bottom center of the screen where drag only leads to dismiss -->

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubblePositioner.java

+18 −5
Original line number Diff line number Diff line
@@ -103,7 +103,9 @@ public class BubblePositioner implements BubbleDropTargetBoundsProvider { 
    private int mManageButtonHeight;

    private int mOverflowHeight;

    private int mMinimumFlyoutWidthLargeScreen;

    private int mBubbleBarExpandedViewDropTargetPadding;

    private int mBarExpViewDropTargetPaddingTop;

    private int mBarExpViewDropTargetPaddingBottom;

    private int mBarExpViewDropTargetPaddingHorizontal;



    private PointF mRestingStackPosition;
@@ -173,8 +175,12 @@ public class BubblePositioner implements BubbleDropTargetBoundsProvider { 
                res.getDimensionPixelSize(R.dimen.bubble_bar_expanded_view_width),

                mPositionRect.width() - 2 * mExpandedViewPadding

        );

        mBubbleBarExpandedViewDropTargetPadding = res.getDimensionPixelSize(

                R.dimen.bubble_bar_expanded_view_drop_target_padding);

        mBarExpViewDropTargetPaddingTop = res.getDimensionPixelSize(

                R.dimen.bubble_bar_expanded_view_drop_target_padding_top);

        mBarExpViewDropTargetPaddingBottom = res.getDimensionPixelSize(

                R.dimen.bubble_bar_expanded_view_drop_target_padding_bottom);

        mBarExpViewDropTargetPaddingHorizontal = res.getDimensionPixelSize(

                R.dimen.bubble_bar_expanded_view_drop_target_padding_horizontal);



        if (mShowingInBubbleBar) {

            mExpandedViewLargeScreenWidth = mExpandedViewBubbleBarWidth;
@@ -986,8 +992,15 @@ public class BubblePositioner implements BubbleDropTargetBoundsProvider { 
    public Rect getBubbleBarExpandedViewDropTargetBounds(boolean onLeft) {

        Rect bounds = new Rect();

        getBubbleBarExpandedViewBounds(onLeft, false, bounds);

        bounds.inset(mBubbleBarExpandedViewDropTargetPadding,

                mBubbleBarExpandedViewDropTargetPadding);

        // Drop target bounds are based on expanded view bounds with some padding added

        int leftPadding = onLeft ? 0 : mBarExpViewDropTargetPaddingHorizontal;

        int rightPadding = onLeft ? mBarExpViewDropTargetPaddingHorizontal : 0;

        bounds.inset(

                leftPadding,

                mBarExpViewDropTargetPaddingTop,

                rightPadding,

                mBarExpViewDropTargetPaddingBottom

        );

        return bounds;

    }

}