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

Commit a6e431e9 authored by Mady Mellor's avatar Mady Mellor
Browse files

Support left & right clipping for BubbleExpandedView 

Currently we only allow clipping for the top and bottom of
the expanded view. This CL enables clipping for left and right
sides of the view as well.

This is code is currently unused, but will be used for the new
expanded view animations (which will be initiated behind a flag).

Test: treehugger
Bug: 311450609
Change-Id: I7b00f1352d4de2031e6b744bff8c4a00d594cc01
parent 9a9bb380

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

+27 −4
Original line number Diff line number Diff line
@@ -176,7 +176,9 @@ public class BubbleExpandedView extends LinearLayout { 
    private float mCornerRadius = 0f;

    private int mBackgroundColorFloating;

    private boolean mUsingMaxHeight;

    private int mLeftClip = 0;

    private int mTopClip = 0;

    private int mRightClip = 0;

    private int mBottomClip = 0;

    @Nullable private Bubble mBubble;

    private PendingIntent mPendingIntent;
@@ -353,7 +355,8 @@ public class BubbleExpandedView extends LinearLayout { 
        mExpandedViewContainer.setOutlineProvider(new ViewOutlineProvider() {

            @Override

            public void getOutline(View view, Outline outline) {

                Rect clip = new Rect(0, mTopClip, view.getWidth(), view.getHeight() - mBottomClip);

                Rect clip = new Rect(mLeftClip, mTopClip, view.getWidth() - mRightClip,

                        view.getHeight() - mBottomClip);

                outline.setRoundRect(clip, mCornerRadius);

            }

        });
@@ -756,8 +759,26 @@ public class BubbleExpandedView extends LinearLayout { 
        onContainerClipUpdate();

    }



    /**

     * Sets the clipping for the view.

     */

    public void setTaskViewClip(Rect rect) {

        mLeftClip = rect.left;

        mTopClip = rect.top;

        mRightClip = rect.right;

        mBottomClip = rect.bottom;

        onContainerClipUpdate();

    }



    /**

     * Returns a rect representing the clipping for the view.

     */

    public Rect getTaskViewClip() {

        return new Rect(mLeftClip, mTopClip, mRightClip, mBottom);

    }



    private void onContainerClipUpdate() {

        if (mTopClip == 0 && mBottomClip == 0) {

        if (mTopClip == 0 && mBottomClip == 0 && mRightClip == 0 && mLeftClip == 0) {

            if (mIsClipping) {

                mIsClipping = false;

                if (mTaskView != null) {
@@ -775,8 +796,10 @@ public class BubbleExpandedView extends LinearLayout { 
            }

            mExpandedViewContainer.invalidateOutline();

            if (mTaskView != null) {

                mTaskView.setClipBounds(new Rect(0, mTopClip, mTaskView.getWidth(),

                        mTaskView.getHeight() - mBottomClip));

                Rect clipBounds = new Rect(mLeftClip, mTopClip,

                        mTaskView.getWidth() - mRightClip,

                        mTaskView.getHeight() - mBottomClip);

                mTaskView.setClipBounds(clipBounds);

            }

        }

    }