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

Commit a5924611 authored by Ats Jenk's avatar Ats Jenk
Browse files

Update drag target indicator size 

Update based on latest spec. The size is now fixed.

Bug: 405990168
Test: drag app to bubble drag target, check size
Flag: com.android.wm.shell.enable_bubble_to_fullscreen
Change-Id: I119a00e43d11f72f08e5798abc30811f4d206a90
parent 90a077a3

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

+0 −3
Original line number Diff line number Diff line
@@ -291,9 +291,6 @@ 
    <!-- 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>

    <dimen name="bubble_bar_drop_target_width">84dp</dimen>

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

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

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

+4 −4
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ 
    <dimen name="drop_target_full_screen_padding">20dp</dimen>

    <dimen name="drop_target_desktop_window_padding_small">100dp</dimen>

    <dimen name="drop_target_desktop_window_padding_large">130dp</dimen>

    <dimen name="drop_target_expanded_view_width">330</dimen>

    <dimen name="drop_target_expanded_view_height">578</dimen>

    <dimen name="drop_target_expanded_view_padding_bottom">108</dimen>

    <dimen name="drop_target_expanded_view_padding_horizontal">24</dimen>

    <dimen name="drop_target_expanded_view_width">330dp</dimen>

    <dimen name="drop_target_expanded_view_height">578dp</dimen>

    <dimen name="drop_target_expanded_view_padding_bottom">108dp</dimen>

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



    <!-- The corner radius of freeform tasks in desktop windowing. -->

    <dimen name="desktop_windowing_freeform_rounded_corner_radius">16dp</dimen>

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

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

    private int mOverflowHeight;

    private int mMinimumFlyoutWidthLargeScreen;

    private int mBarExpViewDropTargetPaddingTop;

    private int mBarExpViewDropTargetWidth;

    private int mBarExpViewDropTargetHeight;

    private int mBarExpViewDropTargetPaddingBottom;

    private int mBarExpViewDropTargetPaddingHorizontal;

    private int mBarDropTargetWidth;

    private int mBarDropTargetHeight;
@@ -177,12 +177,12 @@ public class BubblePositioner implements BubbleDropTargetBoundsProvider { 
                res.getDimensionPixelSize(R.dimen.bubble_bar_expanded_view_width),

                mPositionRect.width() - 2 * mExpandedViewPadding

        );

        mBarExpViewDropTargetPaddingTop = res.getDimensionPixelSize(

                R.dimen.bubble_bar_expanded_view_drop_target_padding_top);

        mBarExpViewDropTargetWidth = res.getDimensionPixelSize(

                com.android.wm.shell.shared.R.dimen.drop_target_expanded_view_width);

        mBarExpViewDropTargetHeight = res.getDimensionPixelSize(

                com.android.wm.shell.shared.R.dimen.drop_target_expanded_view_height);

        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);

                com.android.wm.shell.shared.R.dimen.drop_target_expanded_view_padding_bottom);

        mBarDropTargetWidth = res.getDimensionPixelSize(R.dimen.bubble_bar_drop_target_width);

        mBarDropTargetHeight = res.getDimensionPixelSize(R.dimen.bubble_bar_drop_target_height);
@@ -996,15 +996,14 @@ public class BubblePositioner implements BubbleDropTargetBoundsProvider { 
    public Rect getBubbleBarExpandedViewDropTargetBounds(boolean onLeft) {

        Rect bounds = new Rect();

        getBubbleBarExpandedViewBounds(onLeft, false, bounds);

        // 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

        );

        // Position based on expanded view bounds and adjust the size

        if (onLeft) {

            bounds.right = bounds.left + mBarExpViewDropTargetWidth;

        } else {

            bounds.left = bounds.right - mBarExpViewDropTargetWidth;

        }

        bounds.bottom = mScreenRect.bottom - mBarExpViewDropTargetPaddingBottom;

        bounds.top = bounds.bottom - mBarExpViewDropTargetHeight;

        return bounds;

    }