Fix bug where longpress stops working

For shelfless dismissal, create NotificationMenuRow as empty menu
instead of leaving it null (which skips longpress guts open)

Fixes: 173252412
Bug: 172289783
Test: visual - longpress works for hun/min/expanded notifs, in
shade/home/lockscreen, with flag disabled and enabled

Change-Id: I6d2254da6545bcf1278cc3c90e2fb18d30b81b74
This commit is contained in:
Lyn Han
2020-11-13 18:58:52 -06:00
parent f2977ddaf2
commit 7cee6c5339
2 changed files with 6 additions and 3 deletions

View File

@@ -1163,9 +1163,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView
*/
@Nullable
public NotificationMenuRowPlugin createMenu() {
final boolean removeShelf = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.SHOW_NEW_NOTIF_DISMISS, 0 /* show shelf by default */) == 1;
if (mMenuRow == null || removeShelf) {
if (mMenuRow == null) {
return null;
}
if (mMenuRow.getMenuView() == null) {

View File

@@ -294,6 +294,11 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
} else {
mMenuContainer = new FrameLayout(mContext);
}
final boolean newFlowHideShelf = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.SHOW_NEW_NOTIF_DISMISS, 0) == 1;
if (newFlowHideShelf) {
return;
}
List<MenuItem> menuItems = mOnLeft ? mLeftMenuItems : mRightMenuItems;
for (int i = 0; i < menuItems.size(); i++) {
addMenuView(menuItems.get(i), mMenuContainer);