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 
am: 394cc084f9

Change-Id: Ief37365ae7569c76633137b661a2b50e2110670d
This commit is contained in:
Adrian Roos
2016-06-22 00:41:35 +00:00
committed by android-build-merger
parent 3530cdffe6 394cc084f9
commit 7f7951f6fc
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

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

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) {
return;
}
boolean isHeadsUped = mUseHeadsUp && shouldPeek(shadeEntry);
boolean isHeadsUped = shouldPeek(shadeEntry);
if (isHeadsUped) {
mHeadsUpManager.showNotification(shadeEntry);
// Mark as seen immediately