am 4c319992: Merge "always clear the HeadsUpDecayTimer"

* commit '4c3199928250dfea6307809fd0a2091c78a75240':
  always clear the HeadsUpDecayTimer
This commit is contained in:
Chris Wren
2014-03-26 10:13:29 -07:00
committed by Android Git Automerger

View File

@@ -981,9 +981,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode {
@Override
public void resetHeadsUpDecayTimer() {
mHandler.removeMessages(MSG_HIDE_HEADS_UP);
if (mUseHeadsUp && mHeadsUpNotificationDecay > 0
&& mHeadsUpNotificationView.isClearable()) {
mHandler.removeMessages(MSG_HIDE_HEADS_UP);
mHandler.sendEmptyMessageDelayed(MSG_HIDE_HEADS_UP, mHeadsUpNotificationDecay);
}
}