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

Commit 68c0b05e 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:... 

Merge \\\"Notification: Respect disabled HUNs on updates\\\" into nyc-dev am: 394cc084 am: 7f7951f6
am: 9faaa1ae

Change-Id: I5935814204e0fbf8932d52cc57c3a7348426c3eb
parents 0dd7ae21 9faaa1ae

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
@@ -1410,7 +1410,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