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

Commit 1e7e52b9 authored by mpodolian's avatar mpodolian Committed by Mykola Podolian
Browse files

Removed arrow animation on selected bubble closing. 

We should first decide how we would like to animate dismissal of the
selected bubble, and than implement arrow animation. The issue exists
because background is shrinked without an animation.

Test: Visual
Fixes: 293350516
Flag: ACONFIG com.android.wm.shell.enable_bubble_bar DEVELOPMENT
Change-Id: Ia0cf04671bf9e93c98c45c99a21865055462e6df
parent 1ebeb1d1

quickstep/src/com/android/launcher3/taskbar/bubbles/BubbleBarView.java

+15 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ public class BubbleBarView extends FrameLayout { 
    // Whether the bar is expanded (i.e. the bubble activity is being displayed).

    private boolean mIsBarExpanded = false;

    // The currently selected bubble view.

    @Nullable

    private BubbleView mSelectedBubbleView;

    private BubbleBarLocation mBubbleBarLocation = BubbleBarLocation.DEFAULT;

    // The click listener when the bubble bar is collapsed.
@@ -204,6 +205,7 @@ public class BubbleBarView extends FrameLayout { 
                // If the bar was just collapsed and the overflow was the last bubble that was

                // selected, set the first bubble as selected.

                if (!mIsBarExpanded && mUpdateSelectedBubbleAfterCollapse != null

                        && mSelectedBubbleView != null

                        && mSelectedBubbleView.getBubble() instanceof BubbleBarOverflow) {

                    BubbleView firstBubble = (BubbleView) getChildAt(0);

                    mUpdateSelectedBubbleAfterCollapse.accept(firstBubble.getBubble().getKey());
@@ -533,6 +535,10 @@ public class BubbleBarView extends FrameLayout { 
    @Override

    public void removeView(View view) {

        super.removeView(view);

        if (view == mSelectedBubbleView) {

            mSelectedBubbleView = null;

            mBubbleBarBackground.showArrow(false);

        }

        updateWidth();

    }
@@ -688,8 +694,12 @@ public class BubbleBarView extends FrameLayout { 
     * Sets which bubble view should be shown as selected.

     */

    public void setSelectedBubble(BubbleView view) {

        BubbleView previouslySelectedBubble = mSelectedBubbleView;

        mSelectedBubbleView = view;

        updateArrowForSelected(/* shouldAnimate= */ true);

        mBubbleBarBackground.showArrow(view != null);

        // TODO: (b/283309949) remove animation should be implemented first, so than arrow

        //  animation is adjusted, skip animation for now

        updateArrowForSelected(previouslySelectedBubble != null);

    }



    /**
@@ -714,6 +724,10 @@ public class BubbleBarView extends FrameLayout { 
        // Find the center of the bubble when it's expanded, set the arrow position to it.

        final float tx = arrowPositionForSelectedWhenExpanded();

        final float currentArrowPosition = mBubbleBarBackground.getArrowPositionX();

        if (tx == currentArrowPosition) {

            // arrow position remains unchanged

            return;

        }

        if (shouldAnimate && currentArrowPosition > expandedWidth()) {

            Log.d(TAG, "arrow out of bounds of expanded view, skip animation");

            shouldAnimate = false;