diff options
3 files changed, 0 insertions, 28 deletions
diff --git a/packages/SystemUI/res/layout/status_bar_notification_row.xml b/packages/SystemUI/res/layout/status_bar_notification_row.xml index 2e7ab7fe8904..f15ca9e972c2 100644 --- a/packages/SystemUI/res/layout/status_bar_notification_row.xml +++ b/packages/SystemUI/res/layout/status_bar_notification_row.xml @@ -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" diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index 05a5a8ea3484..03b263d2ae95 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -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); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java index b1e08b81b6e0..fd3a9d5e2bd4 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationViewHierarchyManager.java @@ -350,9 +350,6 @@ public class NotificationViewHierarchyManager { } } - row.showBlockingHelperButton(entry.userSentiment == - NotificationListenerService.Ranking.USER_SENTIMENT_NEGATIVE); - row.showAppOpsIcons(entry.mActiveAppOps); } |