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

Commit 391fabe9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix off-center bubble pointer" into rvc-dev am: ade182cd 

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

Change-Id: I1ff4b86861b2b8d9a08b1553c50ff044cfe678ec
parents df4b6ae0 ade182cd

packages/SystemUI/src/com/android/systemui/bubbles/BubbleExpandedView.java

+6 −6
Original line number Original line Diff line number Diff line
@@ -120,6 +120,8 @@ public class BubbleExpandedView extends LinearLayout { 
    private int mPointerWidth;

    private int mPointerWidth;

    private int mPointerHeight;

    private int mPointerHeight;

    private ShapeDrawable mPointerDrawable;

    private ShapeDrawable mPointerDrawable;

    private int mExpandedViewPadding;







    @Nullable private Bubble mBubble;

    @Nullable private Bubble mBubble;
@@ -345,11 +347,9 @@ public class BubbleExpandedView extends LinearLayout { 
            return view.onApplyWindowInsets(insets);

            return view.onApplyWindowInsets(insets);

        });

        });





        final int expandedViewPadding =

        mExpandedViewPadding = res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding);

                res.getDimensionPixelSize(R.dimen.bubble_expanded_view_padding);

        setPadding(mExpandedViewPadding, mExpandedViewPadding, mExpandedViewPadding,



                mExpandedViewPadding);

        setPadding(

                expandedViewPadding, expandedViewPadding, expandedViewPadding, expandedViewPadding);

        setOnTouchListener((view, motionEvent) -> {

        setOnTouchListener((view, motionEvent) -> {

            if (!usingActivityView()) {

            if (!usingActivityView()) {

                return false;

                return false;
@@ -729,7 +729,7 @@ public class BubbleExpandedView extends LinearLayout { 
     */

     */

    public void setPointerPosition(float x) {

    public void setPointerPosition(float x) {

        float halfPointerWidth = mPointerWidth / 2f;

        float halfPointerWidth = mPointerWidth / 2f;

        float pointerLeft = x - halfPointerWidth;

        float pointerLeft = x - halfPointerWidth - mExpandedViewPadding;

        mPointerView.setTranslationX(pointerLeft);

        mPointerView.setTranslationX(pointerLeft);

        mPointerView.setVisibility(VISIBLE);

        mPointerView.setVisibility(VISIBLE);

    }

    }