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

Merge "Fix some more empty bubble issues!" into rvc-dev am: aeb6e12780

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12010090

Change-Id: Iffbbf82531881e0d3c7fec72e890613976fa8f23
This commit is contained in:
TreeHugger Robot
2020-06-26 22:22:00 +00:00
committed by Automerger Merge Worker
parent 4c139797af aeb6e12780
commit 695d36a66d
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1307,7 +1307,10 @@ public class BubbleController implements ConfigurationController.ConfigurationLi
for (Pair<Bubble, Integer> removed : removedBubbles) { for (Pair<Bubble, Integer> removed : removedBubbles) {
final Bubble bubble = removed.first; final Bubble bubble = removed.first;
@DismissReason final int reason = removed.second; @DismissReason final int reason = removed.second;
mStackView.removeBubble(bubble);
if (mStackView != null) {
mStackView.removeBubble(bubble);
}
// If the bubble is removed for user switching, leave the notification in place. // If the bubble is removed for user switching, leave the notification in place.
if (reason == DISMISS_USER_CHANGED) { if (reason == DISMISS_USER_CHANGED) {

17
packages/SystemUI/src/com/android/systemui/bubbles/BubbleStackView.java
View File

@@ -1581,7 +1581,13 @@ public class BubbleStackView extends FrameLayout
if (DEBUG_BUBBLE_STACK_VIEW) { if (DEBUG_BUBBLE_STACK_VIEW) {
Log.d(TAG, "setSelectedBubble: " + bubbleToSelect); Log.d(TAG, "setSelectedBubble: " + bubbleToSelect);
} }
if (mExpandedBubble != null && mExpandedBubble.equals(bubbleToSelect)) {
// Ignore this new bubble only if it is the exact same bubble object. Otherwise, we'll want
// to re-render it even if it has the same key (equals() returns true). If the currently
// expanded bubble is removed and instantly re-added, we'll get back a new Bubble instance
// with the same key (with newly inflated expanded views), and we need to render those new
// views.
if (mExpandedBubble == bubbleToSelect) {
return; return;
} }
if (bubbleToSelect == null || bubbleToSelect.getKey() != BubbleOverflow.KEY) { if (bubbleToSelect == null || bubbleToSelect.getKey() != BubbleOverflow.KEY) {
@@ -1661,6 +1667,13 @@ public class BubbleStackView extends FrameLayout
if (DEBUG_BUBBLE_STACK_VIEW) { if (DEBUG_BUBBLE_STACK_VIEW) {
Log.d(TAG, "setExpanded: " + shouldExpand); Log.d(TAG, "setExpanded: " + shouldExpand);
} }
if (!shouldExpand) {
// If we're collapsing, release the animating-out surface immediately since we have no
// need for it, and this ensures it cannot remain visible as we collapse.
releaseAnimatingOutBubbleBuffer();
}
if (shouldExpand == mIsExpanded) { if (shouldExpand == mIsExpanded) {
return; return;
} }
@@ -2663,7 +2676,7 @@ public class BubbleStackView extends FrameLayout
* expanded bubble. * expanded bubble.
*/ */
private void screenshotAnimatingOutBubbleIntoSurface(Consumer<Boolean> onComplete) { private void screenshotAnimatingOutBubbleIntoSurface(Consumer<Boolean> onComplete) {
if (mExpandedBubble == null || mExpandedBubble.getExpandedView() == null) { if (!mIsExpanded || mExpandedBubble == null || mExpandedBubble.getExpandedView() == null) {
// You can't animate null. // You can't animate null.
onComplete.accept(false); onComplete.accept(false);
return; return;