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

Commit b86d866b authored by Sergey Serokurov's avatar Sergey Serokurov Committed by Automerger Merge Worker
Browse files

Merge "Do not update pointer postion when stack is going to collapse" into... 

Merge "Do not update  pointer postion  when stack is going to collapse" into tm-qpr-dev am: 86d2469d am: b8da6957

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



Change-Id: I716983b7a891ecc56aadc600bfe393f317712dab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 25228678 b8da6957

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
@@ -1823,7 +1823,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);
@@ -1839,8 +1839,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