drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Visual interruptions: stop more full screen intents."

Browse Source
This commit is contained in:
Julia Reynolds
2016-01-26 22:08:28 +00:00
committed by Android (Google) Code Review
parent f641858497 0971cb076d
commit ec0c2d8fde
2 changed files with 10 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

@ -186,7 +186,7 @@ public abstract class BaseStatusBar extends SystemUI implements
protected DevicePolicyManager mDevicePolicyManager;
protected IDreamManager mDreamManager;
PowerManager mPowerManager;
protected PowerManager mPowerManager;
protected StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
// public mode, private notifications, etc

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

@ -1256,7 +1256,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
}
if (!isHeadsUped && notification.getNotification().fullScreenIntent != null) {
if (mNotificationData.shouldSuppressScreenOn(notification.getKey())) {
if (shouldSupressFullScreenIntent(notification.getKey())) {
if (DEBUG) {
Log.d(TAG, "No Fullscreen intent: suppressed by DND: " + notification.getKey());
}
@ -1283,6 +1283,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
setAreThereNotifications();
}
private boolean shouldSupressFullScreenIntent(String key) {
if (mPowerManager.isInteractive()) {
return mNotificationData.shouldSuppressPeek(key);
} else {
return mNotificationData.shouldSuppressScreenOn(key);
}
}
@Override
protected void updateNotificationRanking(RankingMap ranking) {
mNotificationData.updateRanking(ranking);