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

Commit 86bfcee0 authored by Selim Cinek's avatar Selim Cinek
Browse files

Fixed an issue where the action bar below wasn't rounded 

Bug: 69168591
Test: add notification with action bar, observe propper rounding
Change-Id: I69d3a7c776635b1c63d0b91b998f066a0d2f130f
parent 1397ea3b

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

+3 −1
Original line number Diff line number Diff line
@@ -2377,7 +2377,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
            NotificationContentView contentView = (NotificationContentView) child;

            if (isClippingNeeded()) {

                return true;

            } else if (!hasNoRounding() && contentView.shouldClipToRounding()) {

            } else if (!hasNoRounding()

                    && contentView.shouldClipToRounding(getCurrentTopRoundness() != 0.0f,

                    getCurrentBottomRoundness() != 0.0f)) {

                return true;

            }

        } else if (child == mChildrenContainer) {

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

+7 −5
Original line number Diff line number Diff line
@@ -1489,19 +1489,21 @@ public class NotificationContentView extends FrameLayout { 
        return false;

    }



    public boolean shouldClipToRounding() {

        boolean needsPaddings = shouldClipToRounding(getVisibleType());

    public boolean shouldClipToRounding(boolean topRounded, boolean bottomRounded) {

        boolean needsPaddings = shouldClipToRounding(getVisibleType(), topRounded, bottomRounded);

        if (mUserExpanding) {

             needsPaddings |= shouldClipToRounding(mTransformationStartVisibleType);

             needsPaddings |= shouldClipToRounding(mTransformationStartVisibleType, topRounded,

                     bottomRounded);

        }

        return needsPaddings;

    }



    private boolean shouldClipToRounding(int visibleType) {

    private boolean shouldClipToRounding(int visibleType, boolean topRounded,

            boolean bottomRounded) {

        NotificationViewWrapper visibleWrapper = getVisibleWrapper(visibleType);

        if (visibleWrapper == null) {

            return false;

        }

        return visibleWrapper.shouldClipToRounding();

        return visibleWrapper.shouldClipToRounding(topRounded, bottomRounded);

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.animation.AnimatorListenerAdapter; 
import android.content.Context;

import android.graphics.ColorMatrixColorFilter;

import android.graphics.Paint;

import android.os.Build;

import android.view.View;



import com.android.systemui.R;
@@ -118,7 +117,7 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper { 
    }



    @Override

    public boolean shouldClipToRounding() {

    public boolean shouldClipToRounding(boolean topRounded, boolean bottomRounded) {

        return true;

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationMediaTemplateViewWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class NotificationMediaTemplateViewWrapper extends NotificationTemplateVi 
    }



    @Override

    public boolean shouldClipToRounding() {

    public boolean shouldClipToRounding(boolean topRounded, boolean bottomRounded) {

        return true;

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationTemplateViewWrapper.java

+9 −0
Original line number Diff line number Diff line
@@ -265,6 +265,15 @@ public class NotificationTemplateViewWrapper extends NotificationHeaderViewWrapp 
        updateActionOffset();

    }



    @Override

    public boolean shouldClipToRounding(boolean topRounded, boolean bottomRounded) {

        if (super.shouldClipToRounding(topRounded, bottomRounded)) {

            return true;

        }

        return bottomRounded && mActionsContainer != null

                && mActionsContainer.getVisibility() != View.GONE;

    }



    private void updateActionOffset() {

        if (mActionsContainer != null) {

            // We should never push the actions higher than they are in the headsup view.