diff options
author | Jay Aliomer <aaliomer@google.com> | 2021-06-22 14:23:53 -0400 |
---|---|---|
committer | Jay Aliomer <aaliomer@google.com> | 2021-06-22 14:23:53 -0400 |
commit | 8cd9ea63b276d1706a6b82add34f2e6cc8863f93 (patch) | |
tree | 36780f17fb65b2685517ba3feb96ae91d0c4f9b0 | |
parent | 9da336b4c15b88033274f86186d7385d112fb1ed (diff) | |
download | base-8cd9ea63b276d1706a6b82add34f2e6cc8863f93.tar.gz |
No ally notification action when snoozed
Fixes: 182126811
Test: manually
Change-Id: I191788f1d0d45fd4fcecaf84edeb809173798d60
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java index ba28dc59def4..4dc49123339e 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java @@ -133,7 +133,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView private boolean mUpdateBackgroundOnUpdate; private boolean mNotificationTranslationFinished = false; - private ArrayList<MenuItem> mSnoozedMenuItems; + private boolean mIsSnoozed; /** * Listener for when {@link ExpandableNotificationRow} is laid out. @@ -1105,8 +1105,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView false /* force */, false /* removeControls */, -1 /* x */, -1 /* y */, false /* resetMenu */); mNotificationGutsManager.openGuts(this, 0, 0, item); - mSnoozedMenuItems = mMenuRow.getMenuItems(mMenuRow.getMenuView().getContext()); - mMenuRow.resetMenu(); + mIsSnoozed = true; }; } @@ -1821,10 +1820,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView void onGutsClosed() { updateContentAccessibilityImportanceForGuts(true /* isEnabled */); - if (mSnoozedMenuItems != null && mSnoozedMenuItems.size() > 0) { - mMenuRow.setMenuItems(mSnoozedMenuItems); - mSnoozedMenuItems = null; - } + mIsSnoozed = false; } /** @@ -2975,7 +2971,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfoInternal(info); info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK); - if (canViewBeDismissed()) { + if (canViewBeDismissed() && !mIsSnoozed) { info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS); } boolean expandable = shouldShowPublic(); @@ -2991,7 +2987,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView isExpanded = isExpanded(); } } - if (expandable) { + if (expandable && !mIsSnoozed) { if (isExpanded) { info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_COLLAPSE); } else { |