diff options
| author | Chris Wren <cwren@android.com> | 2013-07-30 15:37:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-30 15:37:46 +0000 |
| commit | c743dfd5a9caffcfabe21cc515feb35afd70d405 (patch) | |
| tree | ac41ae48a9a99601534ec6629964db1fbd7d4743 /packages | |
| parent | 97d01407c7db6aeaa9dd100fc95e5b549921b777 (diff) | |
| parent | eda110fdf13021704111c6939abfafdca3d16f9c (diff) | |
| download | frameworks_base-c743dfd5a9caffcfabe21cc515feb35afd70d405.zip frameworks_base-c743dfd5a9caffcfabe21cc515feb35afd70d405.tar.gz frameworks_base-c743dfd5a9caffcfabe21cc515feb35afd70d405.tar.bz2 | |
Merge "insistent heads up should not time out"
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index a8cb955..e8b8dc1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -939,7 +939,8 @@ public class PhoneStatusBar extends BaseStatusBar { @Override public void resetHeadsUpDecayTimer() { mHandler.removeMessages(MSG_HIDE_HEADS_UP); - if (mHeadsUpNotificationDecay > 0) { + if (mUseHeadsUp && mHeadsUpNotificationDecay > 0 + && !mHeadsUpNotificationView.isInsistent()) { mHandler.sendEmptyMessageDelayed(MSG_HIDE_HEADS_UP, mHeadsUpNotificationDecay); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java index 038eba1..7a8ce4f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java @@ -16,6 +16,7 @@ package com.android.systemui.statusbar.policy; +import android.app.Notification; import android.content.Context; import android.content.res.Configuration; import android.graphics.Rect; @@ -199,4 +200,9 @@ public class HeadsUpNotificationView extends LinearLayout implements SwipeHelper mHeadsUp.row.setUserLocked(userLocked); } } + + public boolean isInsistent() { + return mHeadsUp != null + && (mHeadsUp.notification.getNotification().flags & Notification.FLAG_INSISTENT) != 0; + } }
\ No newline at end of file |