Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the ongoing call chip animation" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-20 11:29:19 +00:00
committed by Android (Google) Code Review
parent 34ffe6d58b b81175af14
commit e5607e3ba5
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java
View File

@@ -1709,7 +1709,7 @@ public class CentralSurfacesImpl extends CoreStartable implements
// Wrap the animation controller to dismiss the shade and set // Wrap the animation controller to dismiss the shade and set
// mIsLaunchingActivityOverLockscreen during the animation. // mIsLaunchingActivityOverLockscreen during the animation.
ActivityLaunchAnimator.Controller delegate = wrapAnimationController( ActivityLaunchAnimator.Controller delegate = wrapAnimationController(
animationController, dismissShade); animationController, dismissShade, /* isLaunchForActivity= */ true);
controller = new DelegateLaunchAnimatorController(delegate) { controller = new DelegateLaunchAnimatorController(delegate) {
@Override @Override
public void onIntentStarted(boolean willAnimate) { public void onIntentStarted(boolean willAnimate) {
@@ -2457,7 +2457,7 @@ public class CentralSurfacesImpl extends CoreStartable implements
true /* isActivityIntent */); true /* isActivityIntent */);
ActivityLaunchAnimator.Controller animController = ActivityLaunchAnimator.Controller animController =
animationController != null ? wrapAnimationController(animationController, animationController != null ? wrapAnimationController(animationController,
dismissShade) : null; dismissShade, /* isLaunchForActivity= */ true) : null;
// If we animate, we will dismiss the shade only once the animation is done. This is taken // If we animate, we will dismiss the shade only once the animation is done. This is taken
// care of by the StatusBarLaunchAnimationController. // care of by the StatusBarLaunchAnimationController.
@@ -2535,9 +2535,25 @@ public class CentralSurfacesImpl extends CoreStartable implements
willLaunchResolverActivity, deferred /* deferred */, animate); willLaunchResolverActivity, deferred /* deferred */, animate);
} }
/**
* Return a {@link ActivityLaunchAnimator.Controller} wrapping {@code animationController} so
* that:
* - if it launches in the notification shade window and {@code dismissShade} is true, then
* the shade will be instantly dismissed at the end of the animation.
* - if it launches in status bar window, it will make the status bar window match the device
* size during the animation (that way, the animation won't be clipped by the status bar
* size).
*
* @param animationController the controller that is wrapped and will drive the main animation.
* @param dismissShade whether the notification shade will be dismissed at the end of the
* animation. This is ignored if {@code animationController} is not
* animating in the shade window.
* @param isLaunchForActivity whether the launch is for an activity.
*/
@Nullable @Nullable
private ActivityLaunchAnimator.Controller wrapAnimationController( private ActivityLaunchAnimator.Controller wrapAnimationController(
ActivityLaunchAnimator.Controller animationController, boolean dismissShade) { ActivityLaunchAnimator.Controller animationController, boolean dismissShade,
boolean isLaunchForActivity) {
View rootView = animationController.getLaunchContainer().getRootView(); View rootView = animationController.getLaunchContainer().getRootView();
Optional<ActivityLaunchAnimator.Controller> controllerFromStatusBar = Optional<ActivityLaunchAnimator.Controller> controllerFromStatusBar =
@@ -2551,7 +2567,7 @@ public class CentralSurfacesImpl extends CoreStartable implements
// If the view is not in the status bar, then we are animating a view in the shade. // If the view is not in the status bar, then we are animating a view in the shade.
// We have to make sure that we collapse it when the animation ends or is cancelled. // We have to make sure that we collapse it when the animation ends or is cancelled.
return new StatusBarLaunchAnimatorController(animationController, this, return new StatusBarLaunchAnimatorController(animationController, this,
true /* isLaunchForActivity */); isLaunchForActivity);
} }
return animationController; return animationController;
@@ -4083,8 +4099,9 @@ public class CentralSurfacesImpl extends CoreStartable implements
// We wrap animationCallback with a StatusBarLaunchAnimatorController so that the // We wrap animationCallback with a StatusBarLaunchAnimatorController so that the
// shade is collapsed after the animation (or when it is cancelled, aborted, etc). // shade is collapsed after the animation (or when it is cancelled, aborted, etc).
ActivityLaunchAnimator.Controller controller = ActivityLaunchAnimator.Controller controller =
animationController != null ? new StatusBarLaunchAnimatorController( animationController != null ? wrapAnimationController(
animationController, this, intent.isActivity()) : null; animationController, /* dismissShade= */ true, intent.isActivity())
: null;
mActivityLaunchAnimator.startPendingIntentWithAnimation( mActivityLaunchAnimator.startPendingIntentWithAnimation(
controller, animate, intent.getCreatorPackage(), controller, animate, intent.getCreatorPackage(),