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

Commit bccc4c2c authored by Sergey Serokurov's avatar Sergey Serokurov
Browse files

Do not update pointer postion when stack is going to collapse 

Bug: 232293580
Test: atest SystemUITests
Test: video at https://drive.google.com/file/d/1Yjs7AzTeI_Zp764CPF9d6e7zI-XRvYX4/view?usp=sharing
Change-Id: I3131a8f32e088573e8e4e8401b6cc279e73bef87
parent 2456f495

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+6 −2
Original line number Diff line number Diff line
@@ -1350,14 +1350,18 @@ public class BubbleController { 
                mStackView.setBubbleSuppressed(update.unsuppressedBubble, false);

            }



            boolean collapseStack = update.expandedChanged && !update.expanded;



            // At this point, the correct bubbles are inflated in the stack.

            // Make sure the order in bubble data is reflected in bubble row.

            if (update.orderChanged && mStackView != null) {

                mDataRepository.addBubbles(mCurrentUserId, update.bubbles);

                mStackView.updateBubbleOrder(update.bubbles);

                // if the stack is going to be collapsed, do not update pointer position

                // after reordering

                mStackView.updateBubbleOrder(update.bubbles, !collapseStack);

            }



            if (update.expandedChanged && !update.expanded) {

            if (collapseStack) {

                mStackView.setExpanded(false);

                mSysuiProxy.requestNotificationShadeTopUi(false, TAG);

            }

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

+5 −2
Original line number Diff line number Diff line
@@ -1796,7 +1796,7 @@ public class BubbleStackView extends FrameLayout 
    /**

     * Update bubble order and pointer position.

     */

    public void updateBubbleOrder(List<Bubble> bubbles) {

    public void updateBubbleOrder(List<Bubble> bubbles, boolean updatePointerPositoion) {

        final Runnable reorder = () -> {

            for (int i = 0; i < bubbles.size(); i++) {

                Bubble bubble = bubbles.get(i);
@@ -1812,8 +1812,11 @@ public class BubbleStackView extends FrameLayout 
                    .map(b -> b.getIconView()).collect(Collectors.toList());

            mStackAnimationController.animateReorder(bubbleViews, reorder);

        }



        if (updatePointerPositoion) {

            updatePointerPosition(false /* forIme */);

        }

    }



    /**

     * Changes the currently selected bubble. If the stack is already expanded, the newly selected