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

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

Merge "Increase pointer size, move closer to bubble" into rvc-dev am: b56a2248 am: 11d419a3 

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

Change-Id: Icbf6db1cfbbfc99d13a04e902966e037216d8f8f
parents 34e163fe 11d419a3

packages/SystemUI/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -1221,9 +1221,9 @@ 
    <!-- Padding of bubble overflow empty state subtitle -->

    <dimen name="bubble_empty_overflow_subtitle_padding">50dp</dimen>

    <!-- Height of the triangle that points to the expanded bubble -->

    <dimen name="bubble_pointer_height">4dp</dimen>

    <dimen name="bubble_pointer_height">8dp</dimen>

    <!-- Width of the triangle that points to the expanded bubble -->

    <dimen name="bubble_pointer_width">6dp</dimen>

    <dimen name="bubble_pointer_width">12dp</dimen>

    <!-- Extra padding around the dismiss target for bubbles -->

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

    <!-- Height of button allowing users to adjust settings for bubbles. -->

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

+1 −3
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ public class BubbleStackView extends FrameLayout 
    private int mBubbleTouchPadding;

    private int mExpandedViewPadding;

    private int mCornerRadius;

    private int mPointerHeight;

    private int mStatusBarHeight;

    private int mImeOffset;

    @Nullable private BubbleViewProvider mExpandedBubble;
@@ -784,7 +783,6 @@ public class BubbleStackView extends FrameLayout 
        mBubbleElevation = res.getDimensionPixelSize(R.dimen.bubble_elevation);

        mBubblePaddingTop = res.getDimensionPixelSize(R.dimen.bubble_padding_top);

        mBubbleTouchPadding = res.getDimensionPixelSize(R.dimen.bubble_touch_padding);

        mPointerHeight = res.getDimensionPixelSize(R.dimen.bubble_pointer_height);



        mStatusBarHeight =

                res.getDimensionPixelSize(com.android.internal.R.dimen.status_bar_height);
@@ -2403,7 +2401,7 @@ public class BubbleStackView extends FrameLayout 
     * Calculates the y position of the expanded view when it is expanded.

     */

    float getExpandedViewY() {

        return getStatusBarHeight() + mBubbleSize + mBubblePaddingTop + mPointerHeight;

        return getStatusBarHeight() + mBubbleSize + mBubblePaddingTop;

    }



    /**