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

Commit 7f7951f6 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge \"Notification: Respect disabled HUNs on updates\" into nyc-dev 

am: 394cc084

Change-Id: Ief37365ae7569c76633137b661a2b50e2110670d
parents 3530cdff 394cc084

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -2495,7 +2495,7 @@ public abstract class BaseStatusBar extends SystemUI implements 
    }



    protected boolean shouldPeek(Entry entry, StatusBarNotification sbn) {

        if (isDeviceInVrMode()) {

        if (!mUseHeadsUp || isDeviceInVrMode()) {

            return false;

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        if (shadeEntry == null) {

            return;

        }

        boolean isHeadsUped = mUseHeadsUp && shouldPeek(shadeEntry);

        boolean isHeadsUped = shouldPeek(shadeEntry);

        if (isHeadsUped) {

            mHeadsUpManager.showNotification(shadeEntry);

            // Mark as seen immediately