aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 17:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ActivityLaunchAnimator to cover transitions in general.

Browse Source 
Soon it will be used for both launches and returns, so this name is
more accurate.

Bug: 323863002
Flag: NA
Test: still builds (no functionality change)
Change-Id: Iaff2589401af24c6e9f604b3d7fa11e819fc941a
This commit is contained in:
Luca Zuccarini
2024-02-06 14:03:08 +00:00
parent 810a82f13e
commit 1fcfe364ba
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
View File

@@ -157,7 +157,7 @@ import com.android.quickstep.util.TaskRestartedDuringLaunchListener;
import com.android.quickstep.util.WorkspaceRevealAnim;
import com.android.quickstep.views.FloatingWidgetView;
import com.android.quickstep.views.RecentsView;
import com.android.systemui.animation.ActivityLaunchAnimator;
import com.android.systemui.animation.ActivityTransitionAnimator;
import com.android.systemui.animation.DelegateLaunchAnimatorController;
import com.android.systemui.animation.LaunchableView;
import com.android.systemui.animation.RemoteAnimationDelegate;
@@ -1838,8 +1838,8 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
// The CUJ is logged by the click handler, so we don't log it inside the animation
// library.
ActivityLaunchAnimator.Controller controllerDelegate =
ActivityLaunchAnimator.Controller.fromView(viewToUse, null /* cujType */);
ActivityTransitionAnimator.Controller controllerDelegate =
ActivityTransitionAnimator.Controller.fromView(viewToUse, null /* cujType */);
if (controllerDelegate == null) {
return null;
@@ -1847,7 +1847,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
// This wrapper allows us to override the default value, telling the controller that the
// current window is below the animating window.
ActivityLaunchAnimator.Controller controller =
ActivityTransitionAnimator.Controller controller =
new DelegateLaunchAnimatorController(controllerDelegate) {
@Override
public boolean isBelowAnimatingWindow() {
@@ -1855,7 +1855,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
}
};
ActivityLaunchAnimator.Callback callback = task -> {
ActivityTransitionAnimator.Callback callback = task -> {
final int backgroundColor =
startingWindowListener.mBackgroundColor == Color.TRANSPARENT
? launcher.getScrimView().getBackgroundColor()
@@ -1863,15 +1863,17 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
return ColorUtils.setAlphaComponent(backgroundColor, 255);
};
ActivityLaunchAnimator.Listener listener = new ActivityLaunchAnimator.Listener() {
@Override
public void onLaunchAnimationEnd() {
onEndCallback.executeAllAndDestroy();
}
};
ActivityTransitionAnimator.Listener listener =
new ActivityTransitionAnimator.Listener() {
@Override
public void onTransitionAnimationEnd() {
onEndCallback.executeAllAndDestroy();
}
};
return new ContainerAnimationRunner(
new ActivityLaunchAnimator.AnimationDelegate(controller, callback, listener));
new ActivityTransitionAnimator.AnimationDelegate(
controller, callback, listener));
}
/**