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

Commit 28fef15b authored by Charles He's avatar Charles He Committed by Android (Google) Code Review
Browse files

Merge "Don't show notification shade on keyguard when disabled."

parents 1dbf8558 5f800f5b

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.statusbar.phone;



import static android.app.StatusBarManager.DISABLE2_NOTIFICATION_SHADE;

import static android.app.StatusBarManager.WINDOW_STATE_HIDDEN;

import static android.app.StatusBarManager.WINDOW_STATE_SHOWING;

import static android.app.StatusBarManager.windowStateToString;
@@ -7096,7 +7097,9 @@ public class StatusBar extends SystemUI implements DemoMode, 
    }



    public boolean shouldShowOnKeyguard(StatusBarNotification sbn) {

        return mShowLockscreenNotifications && !mNotificationData.isAmbient(sbn.getKey());

        return mShowLockscreenNotifications

                && ((mDisabled2 & DISABLE2_NOTIFICATION_SHADE) == 0)

                && !mNotificationData.isAmbient(sbn.getKey());

    }



    // extended in StatusBar