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

Commit c721fcc5 authored by Adrian Roos's avatar Adrian Roos
Browse files

Fix DirectReply taking too long in HUNs 

The HUN logic delays removing notifications for a second or
two, but this makes Direct Reply stick around too long after
sending. To prevent this, cancel notifications in the sending
state immediately.

Change-Id: I9e655bb17674265761e1f6cc25acb2fb9f0c72a6
Fixes: 28421972
parent bc243b5f

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -1437,7 +1437,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    public void removeNotification(String key, RankingMap ranking) {

    public void removeNotification(String key, RankingMap ranking) {

        boolean deferRemoval = false;

        boolean deferRemoval = false;

        if (mHeadsUpManager.isHeadsUp(key)) {

        if (mHeadsUpManager.isHeadsUp(key)) {

            deferRemoval = !mHeadsUpManager.removeNotification(key);

            // A cancel() in repsonse to a remote input shouldn't be delayed, as it makes the

            // sending look longer than it takes.

            boolean ignoreEarliestRemovalTime = mRemoteInputController.isSpinning(key)

                    && !FORCE_REMOTE_INPUT_HISTORY;

            deferRemoval = !mHeadsUpManager.removeNotification(key,  ignoreEarliestRemovalTime);

        }

        }

        if (key.equals(mMediaNotificationKey)) {

        if (key.equals(mMediaNotificationKey)) {

            clearCurrentMediaNotification();

            clearCurrentMediaNotification();
@@ -2364,7 +2368,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        if (wasHeadsUp) {

        if (wasHeadsUp) {

            if (!shouldPeek) {

            if (!shouldPeek) {

                // We don't want this to be interrupting anymore, lets remove it

                // We don't want this to be interrupting anymore, lets remove it

                mHeadsUpManager.removeNotification(key);

                mHeadsUpManager.removeNotification(key, false /* ignoreEarliestRemovalTime */);

            } else {

            } else {

                mHeadsUpManager.updateNotification(entry, alertAgain);

                mHeadsUpManager.updateNotification(entry, alertAgain);

            }

            }

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -264,9 +264,9 @@ public class HeadsUpManager implements ViewTreeObserver.OnComputeInternalInsetsL 
     * @return true if the notification was removed and false if it still needs to be kept around

     * @return true if the notification was removed and false if it still needs to be kept around

     * for a bit since it wasn't shown long enough

     * for a bit since it wasn't shown long enough

     */

     */

    public boolean removeNotification(String key) {

    public boolean removeNotification(String key, boolean ignoreEarliestRemovalTime) {

        if (DEBUG) Log.v(TAG, "remove");

        if (DEBUG) Log.v(TAG, "remove");

        if (wasShownLongEnough(key)) {

        if (wasShownLongEnough(key) || ignoreEarliestRemovalTime) {

            releaseImmediately(key);

            releaseImmediately(key);

            return true;

            return true;

        } else {

        } else {