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

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

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

parents ea16efd5 f6967e06

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

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

    }





    protected boolean shouldPeek(Entry entry, StatusBarNotification sbn) {

    protected boolean shouldPeek(Entry entry, StatusBarNotification sbn) {

        if (isDeviceInVrMode()) {

        if (!mUseHeadsUp || isDeviceInVrMode()) {

            return false;

            return false;

        }

        }

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

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

        if (shadeEntry == null) {

            return;

            return;

        }

        }

        boolean isHeadsUped = mUseHeadsUp && shouldPeek(shadeEntry);

        boolean isHeadsUped = shouldPeek(shadeEntry);

        if (isHeadsUped) {

        if (isHeadsUped) {

            mHeadsUpManager.showNotification(shadeEntry);

            mHeadsUpManager.showNotification(shadeEntry);

            // Mark as seen immediately

            // Mark as seen immediately