Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "No ally notification action when snoozed" into sc-dev am: 98efbe8a56

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067452

Change-Id: I2fb925fdf375899c5315728f6bae76cfaddeec65
This commit is contained in:
Jay Aliomer
2021-06-22 20:14:40 +00:00
committed by Automerger Merge Worker
parent 1eb2cf70df 98efbe8a56
commit ab51817639
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
View File

@@ -133,7 +133,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
private boolean mUpdateBackgroundOnUpdate; private boolean mUpdateBackgroundOnUpdate;
private boolean mNotificationTranslationFinished = false; private boolean mNotificationTranslationFinished = false;
private ArrayList<MenuItem> mSnoozedMenuItems; private boolean mIsSnoozed;
/** /**
* Listener for when {@link ExpandableNotificationRow} is laid out. * 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 /* force */, false /* removeControls */, -1 /* x */, -1 /* y */,
false /* resetMenu */); false /* resetMenu */);
mNotificationGutsManager.openGuts(this, 0, 0, item); mNotificationGutsManager.openGuts(this, 0, 0, item);
mSnoozedMenuItems = mMenuRow.getMenuItems(mMenuRow.getMenuView().getContext()); mIsSnoozed = true;
mMenuRow.resetMenu();
}; };
} }
@@ -1821,10 +1820,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
void onGutsClosed() { void onGutsClosed() {
updateContentAccessibilityImportanceForGuts(true /* isEnabled */); updateContentAccessibilityImportanceForGuts(true /* isEnabled */);
if (mSnoozedMenuItems != null && mSnoozedMenuItems.size() > 0) { mIsSnoozed = false;
mMenuRow.setMenuItems(mSnoozedMenuItems);
mSnoozedMenuItems = null;
}
} }
/** /**
@@ -2981,7 +2977,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) { public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
super.onInitializeAccessibilityNodeInfoInternal(info); super.onInitializeAccessibilityNodeInfoInternal(info);
info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK); info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_LONG_CLICK);
if (canViewBeDismissed()) { if (canViewBeDismissed() && !mIsSnoozed) {
info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS); info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_DISMISS);
} }
boolean expandable = shouldShowPublic(); boolean expandable = shouldShowPublic();
@@ -2997,7 +2993,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
isExpanded = isExpanded(); isExpanded = isExpanded();
} }
} }
if (expandable) { if (expandable && !mIsSnoozed) {
if (isExpanded) { if (isExpanded) {
info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_COLLAPSE); info.addAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_COLLAPSE);
} else { } else {