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

Merge "Update stack position after a bubble is removed" into tm-dev

Browse Source
This commit is contained in:
Sergey Serokurov
2022-03-01 21:44:47 +00:00
committed by Android (Google) Code Review
parent d4e035d3c4 d5842c2aaa
commit 697c991ab6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java
View File

@@ -1608,7 +1608,9 @@ public class BubbleStackView extends FrameLayout
Log.d(TAG, "addBubble: " + bubble); Log.d(TAG, "addBubble: " + bubble);
} }
if (getBubbleCount() == 0 && shouldShowStackEdu()) { final boolean firstBubble = getBubbleCount() == 0;
if (firstBubble && shouldShowStackEdu()) {
// Override the default stack position if we're showing user education. // Override the default stack position if we're showing user education.
mStackAnimationController.setStackPosition(mPositioner.getDefaultStartPosition()); mStackAnimationController.setStackPosition(mPositioner.getDefaultStartPosition());
} }
@@ -1621,7 +1623,7 @@ public class BubbleStackView extends FrameLayout
new FrameLayout.LayoutParams(mPositioner.getBubbleSize(), new FrameLayout.LayoutParams(mPositioner.getBubbleSize(),
mPositioner.getBubbleSize())); mPositioner.getBubbleSize()));
if (getBubbleCount() == 0) { if (firstBubble) {
mStackOnLeftOrWillBe = mStackAnimationController.isStackOnLeftSide(); mStackOnLeftOrWillBe = mStackAnimationController.isStackOnLeftSide();
} }
// Set the dot position to the opposite of the side the stack is resting on, since the stack // Set the dot position to the opposite of the side the stack is resting on, since the stack
@@ -1652,6 +1654,10 @@ public class BubbleStackView extends FrameLayout
bubble.cleanupViews(); bubble.cleanupViews();
} }
updateExpandedView(); updateExpandedView();
if (getBubbleCount() == 0 && !isExpanded()) {
// This is the last bubble and the stack is collapsed
updateStackPosition();
}
logBubbleEvent(bubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED); logBubbleEvent(bubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED);
return; return;
} }