Merge "Remove HUN when user launches intent from its guts" into rvc-dev (89e616fa) · Commits · e / os / android_frameworks_base

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

+20 −13

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

	// TODO: Some of this code may be able to move to NotificationEntryManager.		// TODO: Some of this code may be able to move to NotificationEntryManager.
	if (mHeadsUpManager != null && mHeadsUpManager.isAlerting(sbn.getKey())) {		removeHUN(row);
	// 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 */);
	}
	NotificationEntry parentToCancel = null;		NotificationEntry parentToCancel = null;
	if (shouldAutoCancel(sbn) && mGroupManager.isOnlyChildInGroup(sbn)) {		if (shouldAutoCancel(sbn) && mGroupManager.isOnlyChildInGroup(sbn)) {
	NotificationEntry summarySbn = mGroupManager.getLogicalGroupSummary(sbn);		NotificationEntry summarySbn = mGroupManager.getLogicalGroupSummary(sbn);
	@@ -461,8 +450,12 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit
	row, mStatusBar.isOccluded())),		row, mStatusBar.isOccluded())),
	new UserHandle(UserHandle.getUserId(appUid)));		new UserHandle(UserHandle.getUserId(appUid)));
	mActivityLaunchAnimator.setLaunchResult(launchResult, true /* isActivityIntent */);		mActivityLaunchAnimator.setLaunchResult(launchResult, true /* isActivityIntent */);
	if (shouldCollapse()) {
	// Putting it back on the main thread, since we're touching views		// Putting it back on the main thread, since we're touching views
			mMainThreadHandler.post(() -> {
			removeHUN(row);
			});
			if (shouldCollapse()) {
	mMainThreadHandler.post(() -> mCommandQueue.animateCollapsePanels(		mMainThreadHandler.post(() -> mCommandQueue.animateCollapsePanels(
	CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */));		CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */));
	}		}
	@@ -494,6 +487,20 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit
	}, null, false /* afterKeyguardGone */);		}, 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) {		private void handleFullScreenIntent(NotificationEntry entry) {
	if (mNotificationInterruptStateProvider.shouldLaunchFullScreenIntentWhenAdded(entry)) {		if (mNotificationInterruptStateProvider.shouldLaunchFullScreenIntentWhenAdded(entry)) {
	if (shouldSuppressFullScreenIntent(entry)) {		if (shouldSuppressFullScreenIntent(entry)) {