Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3600df80 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug where longpress stops working"

parents dae2b0c2 7cee6c53

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

+1 −3
Original line number Diff line number Diff line
@@ -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) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationMenuRow.java

+5 −0
Original line number Diff line number Diff line
@@ -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);