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

don't bump an active heads up for a corrupt notification

Browse Source 
Change-Id: I405d6438e003b08fc3e144bb870c3b3233f71e26
This commit is contained in:
Chris Wren
2013-08-07 16:05:23 -04:00
parent 464a8ce9cc
commit d4db6cbc0f
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -902,20 +902,19 @@ public class PhoneStatusBar extends BaseStatusBar {
if (mUseHeadsUp && shouldInterrupt(notification)) { if (mUseHeadsUp && shouldInterrupt(notification)) {
if (DEBUG) Log.d(TAG, "launching notification in heads up mode"); if (DEBUG) Log.d(TAG, "launching notification in heads up mode");
// 1. Populate mHeadsUpNotificationView Entry interruptionCandidate = new Entry(key, notification, null);
mInterruptingNotificationTime = System.currentTimeMillis(); if (inflateViews(interruptionCandidate, mHeadsUpNotificationView.getHolder())) {
mInterruptingNotificationEntry = new Entry(key, notification, null); mInterruptingNotificationTime = System.currentTimeMillis();
mInterruptingNotificationEntry = interruptionCandidate;
if (inflateViews(mInterruptingNotificationEntry, // 1. Populate mHeadsUpNotificationView
mHeadsUpNotificationView.getHolder())) {
mHeadsUpNotificationView.setNotification(mInterruptingNotificationEntry); mHeadsUpNotificationView.setNotification(mInterruptingNotificationEntry);
// 2. Animate mHeadsUpNotificationView in // 2. Animate mHeadsUpNotificationView in
mHandler.sendEmptyMessage(MSG_SHOW_HEADS_UP); mHandler.sendEmptyMessage(MSG_SHOW_HEADS_UP);
// 3. Set alarm to age the notification off // 3. Set alarm to age the notification off
resetHeadsUpDecayTimer(); resetHeadsUpDecayTimer();
} else {
mInterruptingNotificationEntry = null;
} }
} else if (notification.getNotification().fullScreenIntent != null) { } else if (notification.getNotification().fullScreenIntent != null) {
// Stop screensaver if the notification has a full-screen intent. // Stop screensaver if the notification has a full-screen intent.