Merge "Reorder bubbles without animations on collapse" into sc-dev

     * Update bubble order and pointer position.

     */

    public void updateBubbleOrder(List<Bubble> bubbles) {

        if (isExpansionAnimating()) {

            return;

        }

        final Runnable reorder = () -> {

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

                Bubble bubble = bubbles.get(i);

                mBubbleContainer.reorderView(bubble.getIconView(), i);

            }

        };

        if (mIsExpanded) {

        if (mIsExpanded || isExpansionAnimating()) {

            reorder.run();

            updateBadgesAndZOrder(false /* setBadgeForCollapsedStack */);

        } else {

        } else if (!isExpansionAnimating()) {

            List<View> bubbleViews = bubbles.stream()

                    .map(b -> b.getIconView()).collect(Collectors.toList());

            mStackAnimationController.animateReorder(bubbleViews, reorder);