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

This commit is contained in:
TreeHugger Robot
2016-06-22 00:35:28 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -2491,7 +2491,7 @@ public abstract class BaseStatusBar extends SystemUI implements
}
protected boolean shouldPeek(Entry entry, StatusBarNotification sbn) {
if (isDeviceInVrMode()) {
if (!mUseHeadsUp || isDeviceInVrMode()) {
return false;
}

View File

@@ -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