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

Commit c069ad6f authored by Felka Chang's avatar Felka Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix "Clear all" tap ripple is cut off" into pi-dev

parents d64c07da 79ca96d7

packages/SystemUI/res/layout/status_bar_notification_footer.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
        xmlns:android="http://schemas.android.com/apk/res/android"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingEnd="8dp"

        android:paddingStart="4dp"

        android:paddingEnd="4dp"

        android:visibility="gone">

    <FrameLayout

        android:id="@+id/content"

packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java

+4 −3
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ public abstract class ExpandableView extends FrameLayout { 
    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        final int givenSize = MeasureSpec.getSize(heightMeasureSpec);

        final int viewHorizontalPadding = getPaddingStart() + getPaddingEnd();

        int ownMaxHeight = Integer.MAX_VALUE;

        int heightMode = MeasureSpec.getMode(heightMeasureSpec);

        if (heightMode != MeasureSpec.UNSPECIFIED && givenSize != 0) {
@@ -80,8 +81,8 @@ public abstract class ExpandableView extends FrameLayout { 
                        ? MeasureSpec.makeMeasureSpec(ownMaxHeight, MeasureSpec.EXACTLY)

                        : MeasureSpec.makeMeasureSpec(layoutParams.height, MeasureSpec.EXACTLY);

                }

                child.measure(

                        getChildMeasureSpec(widthMeasureSpec, 0 /* padding */, layoutParams.width),

                child.measure(getChildMeasureSpec(

                        widthMeasureSpec, viewHorizontalPadding, layoutParams.width),

                        childHeightSpec);

                int childHeight = child.getMeasuredHeight();

                maxChildHeight = Math.max(maxChildHeight, childHeight);
@@ -94,7 +95,7 @@ public abstract class ExpandableView extends FrameLayout { 
        newHeightSpec = MeasureSpec.makeMeasureSpec(ownHeight, MeasureSpec.EXACTLY);

        for (View child : mMatchParentViews) {

            child.measure(getChildMeasureSpec(

                    widthMeasureSpec, 0 /* padding */, child.getLayoutParams().width),

                    widthMeasureSpec, viewHorizontalPadding, child.getLayoutParams().width),

                    newHeightSpec);

        }

        mMatchParentViews.clear();