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

Commit f04b6c8d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed an issue where group children had rounded corners" into pi-dev

parents e3348a25 eccf494a

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

+2 −0
Original line number Diff line number Diff line
@@ -710,6 +710,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        updateClickAndFocus();

        if (mNotificationParent != null) {

            setOverrideTintColor(NO_COLOR, 0.0f);

            // Let's reset the distance to top roundness, as this isn't applied to group children

            setDistanceToTopRoundness(NO_ROUNDNESS);

            mNotificationParent.updateBackgroundForGroupState();

        }

        updateIconVisibilities();

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import java.util.ArrayList; 
 */

public abstract class ExpandableView extends FrameLayout {



    public static final float NO_ROUNDNESS = -1;

    protected OnHeightChangedListener mOnHeightChangedListener;

    private int mActualHeight;

    protected int mClipTopAmount;

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

+2 −1
Original line number Diff line number Diff line
@@ -776,7 +776,8 @@ public class NotificationStackScrollLayout extends ViewGroup 
            boolean clip = clipStart > start && clipStart < end

                    || clipEnd >= start && clipEnd <= end;

            clip &= !(first && mOwnScrollY == 0);

            child.setDistanceToTopRoundness(clip ? Math.max(start - clipStart, 0) : -1);

            child.setDistanceToTopRoundness(clip ? Math.max(start - clipStart, 0)

                    : ExpandableView.NO_ROUNDNESS);

            first = false;

        }

    }