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

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

Merge "[Notif] Remove old blocking helper button" into pi-dev

parents 4f4baf1e 07a2a6c4

packages/SystemUI/res/layout/status_bar_notification_row.xml

+0 −13
Original line number Diff line number Diff line
@@ -55,19 +55,6 @@ 
        android:paddingStart="8dp"

        />



    <!-- TODO: remove -->

    <ImageButton

        android:id="@+id/helper"

        android:layout_width="48dp"

        android:layout_height="@*android:dimen/notification_header_height"

        android:layout_gravity="top|end"

        android:layout_marginEnd="6dp"

        android:src="@drawable/ic_dnd"

        android:tint="#FF0000"

        android:background="@drawable/ripple_drawable"

        android:visibility="visible"

    />



    <ViewStub

        android:layout="@layout/notification_children_container"

        android:id="@+id/child_container_stub"

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

+0 −12
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
    private AboveShelfChangedListener mAboveShelfChangedListener;

    private HeadsUpManager mHeadsUpManager;

    private Consumer<Boolean> mHeadsUpAnimatingAwayListener;

    private View mHelperButton;

    private boolean mChildIsExpanding;



    private boolean mJustClicked;
@@ -401,8 +400,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        updateLimits();

        updateIconVisibilities();

        updateShelfIconColor();



        showBlockingHelperButton(mEntry.userSentiment == USER_SENTIMENT_NEGATIVE);

        updateRippleAllowed();

    }
@@ -1426,10 +1423,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        requestLayout();

    }



    public void showBlockingHelperButton(boolean show) {

        mHelperButton.setVisibility(show ? View.VISIBLE : View.GONE);

    }



    public void showAppOpsIcons(ArraySet<Integer> activeOps) {

        if (mIsSummaryWithChildren && mChildrenContainer.getHeaderView() != null) {

            mChildrenContainer.getHeaderView().showAppOpsIcons(activeOps);
@@ -1459,11 +1452,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        mPrivateLayout = (NotificationContentView) findViewById(R.id.expanded);

        mLayouts = new NotificationContentView[] {mPrivateLayout, mPublicLayout};



        mHelperButton = findViewById(R.id.helper);

        mHelperButton.setOnClickListener(view -> {

            doLongClickCallback();

        });



        for (NotificationContentView l : mLayouts) {

            l.setExpandClickListener(mExpandClickListener);

            l.setContainingNotification(this);

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

+0 −3
Original line number Diff line number Diff line
@@ -350,9 +350,6 @@ public class NotificationViewHierarchyManager { 
                }

            }



            row.showBlockingHelperButton(entry.userSentiment ==

                    NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE);



            row.showAppOpsIcons(entry.mActiveAppOps);

        }