From eda110fdf13021704111c6939abfafdca3d16f9c Mon Sep 17 00:00:00 2001 From: Chris Wren Date: Thu, 25 Jul 2013 15:31:59 -0400 Subject: [PATCH] insistent heads up should not time out Bug: 10000289 Change-Id: Ic263d9d6e90a61cc766844a8394c71d281f93976 --- .../android/systemui/statusbar/phone/PhoneStatusBar.java | 3 ++- .../systemui/statusbar/policy/HeadsUpNotificationView.java | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 a8cb955f677e8..e8b8dc1869dfd 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 038eba1902240..7a8ce4f8a6ef9 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