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

Merge "insistent heads up should not time out"

Browse Source
This commit is contained in:
Chris Wren
2013-07-30 15:37:46 +00:00
committed by Android (Google) Code Review
parent 97d01407c7 eda110fdf1
commit c743dfd5a9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
packages/SystemUI/src/com/android/systemui/statusbar/policy/HeadsUpNotificationView.java
View File

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