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

Commit 2c82f6bf authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Remove HUN when user launches intent from its guts" into rvc-dev am: 89e616fa 

Change-Id: I33d23bbb67d7057308e8d54d7ee0b8b153b75315
parents 8add478e 89e616fa

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

+20 −13
Original line number Diff line number Diff line
@@ -285,18 +285,7 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
        mLogger.logHandleClickAfterKeyguardDismissed(sbn.getKey());



        // TODO: Some of this code may be able to move to NotificationEntryManager.

        if (mHeadsUpManager != null && mHeadsUpManager.isAlerting(sbn.getKey())) {

            // Release the HUN notification to the shade.



            if (mPresenter.isPresenterFullyCollapsed()) {

                HeadsUpUtil.setIsClickedHeadsUpNotification(row, true);

            }

            //

            // In most cases, when FLAG_AUTO_CANCEL is set, the notification will

            // become canceled shortly by NoMan, but we can't assume that.

            mHeadsUpManager.removeNotification(sbn.getKey(),

                    true /* releaseImmediately */);

        }

        removeHUN(row);

        NotificationEntry parentToCancel = null;

        if (shouldAutoCancel(sbn) && mGroupManager.isOnlyChildInGroup(sbn)) {

            NotificationEntry summarySbn = mGroupManager.getLogicalGroupSummary(sbn);
@@ -461,8 +450,12 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
                                        row, mStatusBar.isOccluded())),

                                new UserHandle(UserHandle.getUserId(appUid)));

                mActivityLaunchAnimator.setLaunchResult(launchResult, true /* isActivityIntent */);

                if (shouldCollapse()) {



                // Putting it back on the main thread, since we're touching views

                mMainThreadHandler.post(() -> {

                    removeHUN(row);

                });

                if (shouldCollapse()) {

                    mMainThreadHandler.post(() -> mCommandQueue.animateCollapsePanels(

                            CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */));

                }
@@ -494,6 +487,20 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
        }, null, false /* afterKeyguardGone */);

    }



    private void removeHUN(ExpandableNotificationRow row) {

        String key = row.getEntry().getSbn().getKey();

        if (mHeadsUpManager != null && mHeadsUpManager.isAlerting(key)) {

            // Release the HUN notification to the shade.

            if (mPresenter.isPresenterFullyCollapsed()) {

                HeadsUpUtil.setIsClickedHeadsUpNotification(row, true);

            }



            // In most cases, when FLAG_AUTO_CANCEL is set, the notification will

            // become canceled shortly by NoMan, but we can't assume that.

            mHeadsUpManager.removeNotification(key, true /* releaseImmediately */);

        }

    }



    private void handleFullScreenIntent(NotificationEntry entry) {

        if (mNotificationInterruptStateProvider.shouldLaunchFullScreenIntentWhenAdded(entry)) {

            if (shouldSuppressFullScreenIntent(entry)) {