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

Commit 6db57580 authored by Selim Cinek's avatar Selim Cinek
Browse files

Removed the group expand button 

It's now a normal group expand button.

Bug: 27431551
Change-Id: I6e5dc83613533ef8590b0a8180d8c4be8322aa21
parent 3b050317

core/java/android/view/NotificationHeaderView.java

+3 −22
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import java.util.ArrayList; 
public class NotificationHeaderView extends ViewGroup {

    public static final int NO_COLOR = -1;

    private final int mChildMinWidth;

    private final int mExpandTopPadding;

    private final int mContentEndMargin;

    private View mAppName;

    private View mSubTextView;
@@ -47,7 +46,6 @@ public class NotificationHeaderView extends ViewGroup { 
    private View mInfo;

    private int mIconColor;

    private int mOriginalNotificationColor;

    private boolean mGroupHeader;

    private boolean mExpanded;

    private boolean mShowWorkBadgeAtEnd;
@@ -69,7 +67,6 @@ public class NotificationHeaderView extends ViewGroup { 
                com.android.internal.R.dimen.notification_header_shrink_min_width);

        mContentEndMargin = getResources().getDimensionPixelSize(

                com.android.internal.R.dimen.notification_content_margin_end);

        mExpandTopPadding = (int) (1 * getResources().getDisplayMetrics().density);

    }



    @Override
@@ -209,11 +206,6 @@ public class NotificationHeaderView extends ViewGroup { 
        return mOriginalNotificationColor;

    }



    public void setIsGroupHeader(boolean isGroupHeader) {

        mGroupHeader = isGroupHeader;

        updateExpandButton();

    }



    @RemotableViewMethod

    public void setExpanded(boolean expanded) {

        mExpanded = expanded;
@@ -222,24 +214,13 @@ public class NotificationHeaderView extends ViewGroup { 


    private void updateExpandButton() {

        int drawableId;

        int paddingTop = 0;

        if (mGroupHeader) {

            if (mExpanded) {

                drawableId = com.android.internal.R.drawable.ic_collapse_bundle;

            } else {

                drawableId =com.android.internal.R.drawable.ic_expand_bundle;

            }

        } else {

        if (mExpanded) {

            drawableId = com.android.internal.R.drawable.ic_collapse_notification;

        } else {

            drawableId = com.android.internal.R.drawable.ic_expand_notification;

        }

            paddingTop = mExpandTopPadding;

        }

        mExpandButton.setImageDrawable(getContext().getDrawable(drawableId));

        mExpandButton.setColorFilter(mOriginalNotificationColor);

        mExpandButton.setPadding(0, paddingTop, 0, 0);

    }



    public void setShowWorkBadgeAtEnd(boolean showWorkBadgeAtEnd) {

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

+0 −7
Original line number Diff line number Diff line
@@ -1283,16 +1283,9 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
            header.reapply(getContext(), mNotificationHeader);

            mNotificationHeaderWrapper.notifyContentUpdated(mEntry.notification);

        }

        updateHeaderExpandButton();

        updateChildrenHeaderAppearance();

    }



    private void updateHeaderExpandButton() {

        if (mIsSummaryWithChildren) {

            mNotificationHeader.setIsGroupHeader(true /* isGroupHeader*/);

        }

    }



    public void updateChildrenHeaderAppearance() {

        if (mIsSummaryWithChildren) {

            mHeaderUtil.updateChildrenHeaderAppearance();