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

Commit 1e795c33 authored by Winson Chung's avatar Winson Chung
Browse files

Handle cases where bubble transitions for newly launched tasks 

- When a bubble invocation is done via a path that isn't associated with
  a particular task (ie. via taskbar menu or notification vs app handle),
  we can use a mixed transition to start a new bubble transition.  This
  is necessary also to allow other features to hook into the enter-bubble
  flow, to clean up as well (ie. when entering via split in the future),
  or when handling transitions out of bubbles.

Bug: 396313972
Bug: 408328557
Flag: EXEMPT bugfix
Test: atest WMShellUnitTests
Test: Launch an app, invoke bubble via taskbar for the same app
Change-Id: I346b999e4c49ff3b11efc8523eedc6d98e0b6fc0
parent 06523e8e

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

+6 −8
Original line number Diff line number Diff line
@@ -1592,7 +1592,11 @@ public class BubbleController implements ConfigurationChangeListener, 
            mBubbleData.setSelectedBubbleAndExpandStack(b, updateLocation);

        } else {

            b.enable(Notification.BubbleMetadata.FLAG_AUTO_EXPAND_BUBBLE);

            inflateAndAdd(b, /* suppressFlyout= */ true, /* showInShade= */ false, updateLocation);



            ensureBubbleViewsAndWindowCreated();

            mBubbleTransitions.startLaunchIntoOrConvertToBubble(b, mExpandedViewManager,

                    mBubbleTaskViewFactory, mBubblePositioner, mStackView, mLayerView,

                    mBubbleIconFactory, mInflateSynchronously);

        }

    }
@@ -3363,13 +3367,7 @@ public class BubbleController implements ConfigurationChangeListener, 
            if (tinfo == null) {

                return;

            }

            Bubble bub = null;

            for (Bubble b : mBubbleData.getBubbles()) {

                if (b.getTaskId() == tinfo.taskId) {

                    bub = b;

                    break;

                }

            }

            Bubble bub = mBubbleData.getBubbleInStackWithTaskId(tinfo.taskId);

            if (bub == null) {

                return;

            }

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

+457 −44

File changed.

Preview size limit exceeded, changes collapsed.

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

+17 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.view.View.Y; 


import static com.android.wm.shell.bubbles.bar.BubbleBarExpandedView.CORNER_RADIUS;

import static com.android.wm.shell.bubbles.bar.BubbleBarExpandedView.TASK_VIEW_ALPHA;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES_NOISY;

import static com.android.wm.shell.shared.animation.Interpolators.EMPHASIZED;

import static com.android.wm.shell.shared.animation.Interpolators.EMPHASIZED_DECELERATE;
@@ -48,6 +49,7 @@ import android.widget.FrameLayout; 
import androidx.annotation.Nullable;



import com.android.app.animation.Interpolators;

import com.android.internal.protolog.ProtoLog;

import com.android.wm.shell.R;

import com.android.wm.shell.animation.SizeChangeAnimation;

import com.android.wm.shell.bubbles.Bubble;
@@ -124,6 +126,7 @@ public class BubbleBarAnimationHelper { 
     */

    public void animateExpansion(BubbleViewProvider expandedBubble,

            @Nullable Runnable afterAnimation) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateExpansion()");

        mExpandedBubble = expandedBubble;

        final BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {
@@ -141,6 +144,8 @@ public class BubbleBarAnimationHelper { 
        bbev.setAnimationMatrix(mExpandedViewContainerMatrix);



        bbev.animateExpansionWhenTaskViewVisible(() -> {

            ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateExpansion(): "

                    + "task view visible");

            bbev.getHandleView().setAlpha(1);

            ObjectAnimator alphaAnim = createAlphaAnimator(bbev, /* visible= */ true);

            alphaAnim.setDuration(EXPANDED_VIEW_EXPAND_ALPHA_DURATION);
@@ -176,6 +181,7 @@ public class BubbleBarAnimationHelper { 
    }



    private void prepareForAnimateIn(BubbleBarExpandedView bbev) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.prepareForAnimateIn()");

        bbev.setAnimating(true);

        updateExpandedView(bbev);

        // We need to be Z ordered on top in order for taskView alpha to work.
@@ -193,6 +199,7 @@ public class BubbleBarAnimationHelper { 
     * @param endRunnable a runnable to run at the end of the animation.

     */

    public void animateCollapse(Runnable endRunnable) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateCollapse()");

        final BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {

            Log.w(TAG, "Trying to animate collapse without a bubble");
@@ -256,6 +263,7 @@ public class BubbleBarAnimationHelper { 
     */

    public void animateSwitch(BubbleViewProvider fromBubble, BubbleViewProvider toBubble,

            @Nullable Runnable afterAnimation) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateSwitch()");

        /*

         * Switch animation

         *
@@ -307,6 +315,7 @@ public class BubbleBarAnimationHelper { 
    }



    private Animator switchOutAnimator(BubbleBarExpandedView bbev) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.switchOutAnimator()");

        setPivotToCenter(bbev);

        AnimatorSet scaleAnim = new AnimatorSet();

        scaleAnim.playTogether(
@@ -336,6 +345,7 @@ public class BubbleBarAnimationHelper { 
    }



    private Animator switchInAnimator(BubbleBarExpandedView bbev, float restingTx) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.switchInAnimator(): alpha=1f");

        ObjectAnimator positionAnim = ObjectAnimator.ofFloat(bbev, TRANSLATION_X, restingTx);

        positionAnim.setInterpolator(Interpolators.EMPHASIZED_DECELERATE);

        positionAnim.setStartDelay(SWITCH_IN_ANIM_DELAY);
@@ -387,6 +397,7 @@ public class BubbleBarAnimationHelper { 
     * Animate the expanded bubble when it is being dragged

     */

    public void animateStartDrag() {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateStartDrag()");

        final BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {

            Log.w(TAG, "Trying to animate start drag without a bubble");
@@ -420,6 +431,7 @@ public class BubbleBarAnimationHelper { 
     * @param endRunnable a runnable to run at the end of the animation

     */

    public void animateDismiss(Runnable endRunnable) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateDismiss()");

        final BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {

            Log.w(TAG, "Trying to animate dismiss without a bubble");
@@ -442,6 +454,7 @@ public class BubbleBarAnimationHelper { 
     * Animate current expanded bubble back to its rest position

     */

    public void animateToRestPosition() {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateToRestPosition()");

        BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {

            Log.w(TAG, "Trying to animate expanded view to rest position without a bubble");
@@ -483,6 +496,7 @@ public class BubbleBarAnimationHelper { 
     * @param endRunnable a runnable to run at the end of the animation

     */

    public void animateIntoTarget(MagneticTarget target, @Nullable Runnable endRunnable) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateIntoTarget()");

        BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {

            Log.w(TAG, "Trying to snap the expanded view to target without a bubble");
@@ -554,6 +568,7 @@ public class BubbleBarAnimationHelper { 
     * Animate currently expanded view when it is released from dismiss view

     */

    public void animateUnstuckFromDismissView(MagneticTarget target) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateUnstuckFromDismissView()");

        BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {

            Log.w(TAG, "Trying to unsnap the expanded view from dismiss without a bubble");
@@ -586,6 +601,7 @@ public class BubbleBarAnimationHelper { 
            @NonNull SurfaceControl snapshot,

            @NonNull SurfaceControl taskLeash,

            @Nullable Runnable afterAnimation) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.animateConvert()");

        mExpandedBubble = expandedBubble;

        final BubbleBarExpandedView bbev = getExpandedView();

        if (bbev == null) {
@@ -625,6 +641,7 @@ public class BubbleBarAnimationHelper { 
     * Cancel current animations

     */

    public void cancelAnimations() {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBAnimationHelper.cancelAnimations()");

        PhysicsAnimator.getInstance(mExpandedViewContainerMatrix).cancel();

        BubbleBarExpandedView bbev = getExpandedView();

        if (bbev != null) {

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

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.wm.shell.bubbles.bar; 


import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;



import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES_NOISY;



import android.annotation.Nullable;

import android.content.Context;

import android.graphics.Insets;
@@ -36,6 +38,7 @@ import android.widget.FrameLayout; 
import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;



import com.android.internal.protolog.ProtoLog;

import com.android.wm.shell.R;

import com.android.wm.shell.bubbles.Bubble;

import com.android.wm.shell.bubbles.BubbleExpandedViewManager;
@@ -441,6 +444,7 @@ public class BubbleBarExpandedView extends FrameLayout implements BubbleTaskView 
    }



    private void onTaskViewVisible() {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "BBEV.onTaskViewVisible()");

        // if we're waiting to be visible, start the expansion animation if it's pending.

        if (mVisibilityState == TaskViewVisibilityState.PENDING_VISIBLE) {

            mVisibilityState = TaskViewVisibilityState.VISIBLE;

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

+16 −0
Original line number Diff line number Diff line
@@ -397,6 +397,18 @@ public class BubbleBarLayerView extends FrameLayout 
     *                       bubble is expanded.

     */

    public void animateExpand(BubbleViewProvider previousBubble) {

        animateExpand(previousBubble, null /* finishCallback */);

    }



    /**

     * Performs an animation to open a bubble with content that is not already visible.

     *

     * @param previousBubble If non-null, this is a bubble that is already showing before the new

     *                       bubble is expanded.

     * @param animFinish If non-null, the callback triggered after the expand animation completes

     */

    public void animateExpand(BubbleViewProvider previousBubble,

            @Nullable Runnable animFinish) {

        if (!mIsExpanded || mExpandedBubble == null) {

            throw new IllegalStateException("Can't animateExpand without expnaded state");

        }
@@ -410,6 +422,10 @@ public class BubbleBarLayerView extends FrameLayout 
            mHandleTouchDelegate = new TouchDelegate(mHandleTouchBounds,

                    mExpandedView.getHandleView());

            setTouchDelegate(mHandleTouchDelegate);



            if (animFinish != null) {

                animFinish.run();

            }

        };



        if (previousBubble != null) {