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

Commit 61bc09ac authored by Ats Jenk's avatar Ats Jenk
Browse files

Null safe BubbleBarAnimationHelper 

Refactor bubble bar expanded view access in BubbleBarAnimationHelper.
Unify the null checks for the expanded bubble and expanded view. So we
don't have to keep checking for both.

Bug: 283991264
Test: open/close bubble bar bubble
Change-Id: I8d8bb16729dd2175d31b621ff1b7e2a6730db6ec
parent d41bfb45

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

+38 −37
Original line number Diff line number Diff line
@@ -78,34 +78,37 @@ public class BubbleBarAnimationHelper { 
        mExpandedViewAlphaAnimator.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationStart(Animator animation) {

                if (mExpandedBubble != null && mExpandedBubble.getBubbleBarExpandedView() != null) {

                BubbleBarExpandedView bbev = getExpandedView();

                if (bbev != null) {

                    // We need to be Z ordered on top in order for alpha animations to work.

                    mExpandedBubble.getBubbleBarExpandedView().setSurfaceZOrderedOnTop(true);

                    mExpandedBubble.getBubbleBarExpandedView().setAnimating(true);

                    bbev.setSurfaceZOrderedOnTop(true);

                    bbev.setAnimating(true);

                }

            }



            @Override

            public void onAnimationEnd(Animator animation) {

                if (mExpandedBubble != null && mExpandedBubble.getBubbleBarExpandedView() != null) {

                BubbleBarExpandedView bbev = getExpandedView();

                if (bbev != null) {

                    // The surface needs to be Z ordered on top for alpha values to work on the

                    // TaskView, and if we're temporarily hidden, we are still on the screen

                    // with alpha = 0f until we animate back. Stay Z ordered on top so the alpha

                    // = 0f remains in effect.

                    if (mIsExpanded) {

                        mExpandedBubble.getBubbleBarExpandedView().setSurfaceZOrderedOnTop(false);

                        bbev.setSurfaceZOrderedOnTop(false);

                    }



                    mExpandedBubble.getBubbleBarExpandedView().setContentVisibility(mIsExpanded);

                    mExpandedBubble.getBubbleBarExpandedView().setAnimating(false);

                    bbev.setContentVisibility(mIsExpanded);

                    bbev.setAnimating(false);

                }

            }

        });

        mExpandedViewAlphaAnimator.addUpdateListener(valueAnimator -> {

            if (mExpandedBubble != null && mExpandedBubble.getBubbleBarExpandedView() != null) {

            BubbleBarExpandedView bbev = getExpandedView();

            if (bbev != null) {

                float alpha = (float) valueAnimator.getAnimatedValue();

                mExpandedBubble.getBubbleBarExpandedView().setTaskViewAlpha(alpha);

                mExpandedBubble.getBubbleBarExpandedView().setAlpha(alpha);

                bbev.setTaskViewAlpha(alpha);

                bbev.setAlpha(alpha);

            }

        });

    }
@@ -116,11 +119,8 @@ public class BubbleBarAnimationHelper { 
    public void animateExpansion(BubbleViewProvider expandedBubble,

            @Nullable Runnable afterAnimation) {

        mExpandedBubble = expandedBubble;

        if (mExpandedBubble == null) {

            return;

        }

        BubbleBarExpandedView bev = mExpandedBubble.getBubbleBarExpandedView();

        if (bev == null) {

        final BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {

            return;

        }

        mIsExpanded = true;
@@ -129,11 +129,11 @@ public class BubbleBarAnimationHelper { 
        mExpandedViewContainerMatrix.setScaleY(0f);



        updateExpandedView();

        bev.setAnimating(true);

        bev.setContentVisibility(false);

        bev.setAlpha(0f);

        bev.setTaskViewAlpha(0f);

        bev.setVisibility(VISIBLE);

        bbev.setAnimating(true);

        bbev.setContentVisibility(false);

        bbev.setAlpha(0f);

        bbev.setTaskViewAlpha(0f);

        bbev.setVisibility(VISIBLE);



        // Set the pivot point for the scale, so the view animates out from the bubble bar.

        Point bubbleBarPosition = mPositioner.getBubbleBarPosition();
@@ -143,7 +143,7 @@ public class BubbleBarAnimationHelper { 
                bubbleBarPosition.x,

                bubbleBarPosition.y);



        bev.setAnimationMatrix(mExpandedViewContainerMatrix);

        bbev.setAnimationMatrix(mExpandedViewContainerMatrix);



        mExpandedViewAlphaAnimator.start();
@@ -156,13 +156,12 @@ public class BubbleBarAnimationHelper { 
                        AnimatableScaleMatrix.getAnimatableValueForScaleFactor(1f),

                        mScaleInSpringConfig)

                .addUpdateListener((target, values) -> {

                    mExpandedBubble.getBubbleBarExpandedView().setAnimationMatrix(

                            mExpandedViewContainerMatrix);

                    bbev.setAnimationMatrix(mExpandedViewContainerMatrix);

                })

                .withEndActions(() -> {

                    bev.setAnimationMatrix(null);

                    bbev.setAnimationMatrix(null);

                    updateExpandedView();

                    bev.setSurfaceZOrderedOnTop(false);

                    bbev.setSurfaceZOrderedOnTop(false);

                    if (afterAnimation != null) {

                        afterAnimation.run();

                    }
@@ -177,7 +176,8 @@ public class BubbleBarAnimationHelper { 
     */

    public void animateCollapse(Runnable endRunnable) {

        mIsExpanded = false;

        if (mExpandedBubble == null || mExpandedBubble.getBubbleBarExpandedView() == null) {

        final BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {

            Log.w(TAG, "Trying to animate collapse without a bubble");

            return;

        }
@@ -196,17 +196,10 @@ public class BubbleBarAnimationHelper { 
                                EXPANDED_VIEW_ANIMATE_OUT_SCALE_AMOUNT),

                        mScaleOutSpringConfig)

                .addUpdateListener((target, values) -> {

                    if (mExpandedBubble != null

                            && mExpandedBubble.getBubbleBarExpandedView() != null) {

                        mExpandedBubble.getBubbleBarExpandedView().setAnimationMatrix(

                                mExpandedViewContainerMatrix);

                    }

                    bbev.setAnimationMatrix(mExpandedViewContainerMatrix);

                })

                .withEndActions(() -> {

                    if (mExpandedBubble != null

                            && mExpandedBubble.getBubbleBarExpandedView() != null) {

                        mExpandedBubble.getBubbleBarExpandedView().setAnimationMatrix(null);

                    }

                    bbev.setAnimationMatrix(null);

                    if (endRunnable != null) {

                        endRunnable.run();

                    }
@@ -223,12 +216,20 @@ public class BubbleBarAnimationHelper { 
        mExpandedViewAlphaAnimator.cancel();

    }



    private @Nullable BubbleBarExpandedView getExpandedView() {

        BubbleViewProvider bubble = mExpandedBubble;

        if (bubble != null) {

            return bubble.getBubbleBarExpandedView();

        }

        return null;

    }



    private void updateExpandedView() {

        if (mExpandedBubble == null || mExpandedBubble.getBubbleBarExpandedView() == null) {

        BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {

            Log.w(TAG, "Trying to update the expanded view without a bubble");

            return;

        }

        BubbleBarExpandedView bbev = mExpandedBubble.getBubbleBarExpandedView();



        boolean isOverflowExpanded = mExpandedBubble.getKey().equals(BubbleOverflow.KEY);

        final int padding = mPositioner.getBubbleBarExpandedViewPadding();