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

Commit fd64aa2c authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Update non-sandwiched notification corner radius"

parents 8cc7994e f3155444

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ 
    <!-- Minimum height of a notification to be interactable -->

    <dimen name="notification_min_interaction_height">40dp</dimen>



    <!-- New radius for notifications. -->

    <dimen name="notification_corner_radius">20dp</dimen>



    <!-- the padding of the shelf icon container -->

    <dimen name="shelf_icon_container_padding">13dp</dimen>

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableOutlineView.java

+1 −2
Original line number Diff line number Diff line
@@ -239,8 +239,7 @@ public abstract class ExpandableOutlineView extends ExpandableView { 
        mOutlineRadius = res.getDimension(R.dimen.notification_shadow_radius);

        mAlwaysRoundBothCorners = res.getBoolean(R.bool.config_clipNotificationsToOutline);

        if (!mAlwaysRoundBothCorners) {

            mOutlineRadius = res.getDimensionPixelSize(

                    Utils.getThemeAttr(mContext, android.R.attr.dialogCornerRadius));

            mOutlineRadius = res.getDimensionPixelSize(R.dimen.notification_corner_radius);

        }

        setClipToOutline(mAlwaysRoundBothCorners);

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayout.java

+2 −4
Original line number Diff line number Diff line
@@ -892,15 +892,13 @@ public class NotificationStackScrollLayout extends ViewGroup implements Dumpable 
        mSidePaddings = res.getDimensionPixelSize(R.dimen.notification_side_paddings);

        mMinInteractionHeight = res.getDimensionPixelSize(

                R.dimen.notification_min_interaction_height);

        mCornerRadius = res.getDimensionPixelSize(

                Utils.getThemeAttr(mContext, android.R.attr.dialogCornerRadius));

        mCornerRadius = res.getDimensionPixelSize(R.dimen.notification_corner_radius);

        mHeadsUpInset = mStatusBarHeight + res.getDimensionPixelSize(

                R.dimen.heads_up_status_bar_padding);

    }



    void updateCornerRadius() {

        int newRadius = getResources().getDimensionPixelSize(

                Utils.getThemeAttr(getContext(), android.R.attr.dialogCornerRadius));

        int newRadius = getResources().getDimensionPixelSize(R.dimen.notification_corner_radius);

        if (mCornerRadius != newRadius) {

            mCornerRadius = newRadius;

            invalidate();