Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-22 00:35:28 +00:00
committed by Android (Google) Code Review
parent ea16efd52c f6967e0691
commit 394cc084f9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

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

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

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