Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove bubble when PendingIntent is canceled

Browse Source 
Bug: 151104690

Test: manual
1) Expand bubble with FLAG_ONE_SHOT PendingIntent => bubble removed

Test: manual
1) Overflow bubble with FLAG_ONE_SHOT PendingIntent without expanding it
2) Promote bubble from overflow => bubble removed

Test: manual
1) Expand bubble without FLAG_ONE_SHOT PendingIntent
2) Overflow bubble, promote bubble out of overflow
3) Expand bubble again without issue

Test: atest SystemUITests
Change-Id: I4b0c21dfcd9e424c74dd449146150fe8b830c218
This commit is contained in:
Lyn Han
2020-04-17 11:08:53 -07:00
parent 323d63572d
commit 4cbc14285f
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
View File

@@ -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);
}