Merge "Remove bubble when PendingIntent is canceled" into rvc-dev (89c4f82c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java

+15 −1

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ import android.content.pm.ActivityInfo;
		import android.content.pm.PackageManager;
		import android.content.res.Configuration;
		import android.graphics.Rect;
		import android.os.Handler;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.service.notification.NotificationListenerService;
		@@ -174,6 +175,9 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		private IStatusBarService mBarService;
		private SysUiState mSysUiState;

		// Used to post to main UI thread
		private Handler mHandler = new Handler();

		// Used for determining view rect for touch interaction
		private Rect mTempRect = new Rect();

		@@ -799,7 +803,17 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
		Bubble bubble = mBubbleData.getOrCreateBubble(notif);
		bubble.setInflateSynchronously(mInflateSynchronously);
		bubble.inflate(
		b -> mBubbleData.notificationEntryUpdated(b, suppressFlyout, showInShade),
		b -> {
		mBubbleData.notificationEntryUpdated(b, suppressFlyout, showInShade);
		if (bubble.getBubbleIntent() == null) {
		return;
		}
		bubble.getBubbleIntent().registerCancelListener(pendingIntent -> {
		mHandler.post(
		() -> removeBubble(bubble.getEntry(),
		BubbleController.DISMISS_INVALID_INTENT));
		});
		},
		mContext, mStackView, mBubbleIconFactory);
		}