Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c743dfd5 authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

Merge "insistent heads up should not time out"

parents 97d01407 eda110fd

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

        }

    }

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

+6 −0
Original line number Diff line number Diff line
@@ -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