Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5842c2a authored by Sergey Serokurov's avatar Sergey Serokurov Committed by Mady Mellor
Browse files

Update stack position after a bubble is removed

Bug: 218710452
Test: atest SystemUITests
Change-Id: Ie6103bc85c9f6331ddbc7734f140f2b7b379c84c
parent ff23fb2f
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -1608,7 +1608,9 @@ public class BubbleStackView extends FrameLayout
            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.
            mStackAnimationController.setStackPosition(mPositioner.getDefaultStartPosition());
        }
@@ -1621,7 +1623,7 @@ public class BubbleStackView extends FrameLayout
                new FrameLayout.LayoutParams(mPositioner.getBubbleSize(),
                        mPositioner.getBubbleSize()));

        if (getBubbleCount() == 0) {
        if (firstBubble) {
            mStackOnLeftOrWillBe = mStackAnimationController.isStackOnLeftSide();
        }
        // 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();
                }
                updateExpandedView();
                if (getBubbleCount() == 0 && !isExpanded()) {
                    // This is the last bubble and the stack is collapsed
                    updateStackPosition();
                }
                logBubbleEvent(bubble, FrameworkStatsLog.BUBBLE_UICHANGED__ACTION__DISMISSED);
                return;
            }