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

Merge "Fix bug where longpress stops working"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-11-14 04:26:56 +00:00
committed by Android (Google) Code Review
parent dae2b0c2bd 7cee6c5339
commit 3600df806c
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRow.java
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) {

5
packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java
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);