PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug where scrim did not fade in during staggered workspace animation." into ub-launcher3-rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-06-09 17:13:50 +00:00
committed by Android (Google) Code Review
parent 1a14978809 36918c3e12
commit fd4e7a8907
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
+15 -9
View File
@@ -20,6 +20,7 @@ import static com.android.launcher3.LauncherState.BACKGROUND_APP;
import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.NORMAL;
import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL; import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;
import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.anim.Interpolators.LINEAR;
import static com.android.launcher3.anim.PropertySetter.NO_ANIM_PROPERTY_SETTER;
import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS; import static com.android.launcher3.states.StateAnimationConfig.ANIM_ALL_COMPONENTS;
import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER; import static com.android.launcher3.states.StateAnimationConfig.SKIP_DEPTH_CONTROLLER;
import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW; import static com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW;
@@ -41,6 +42,7 @@ import com.android.launcher3.R;
import com.android.launcher3.ShortcutAndWidgetContainer; import com.android.launcher3.ShortcutAndWidgetContainer;
import com.android.launcher3.Workspace; import com.android.launcher3.Workspace;
import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.anim.PendingAnimation;
import com.android.launcher3.anim.PropertySetter;
import com.android.launcher3.anim.SpringAnimationBuilder; import com.android.launcher3.anim.SpringAnimationBuilder;
import com.android.launcher3.graphics.OverviewScrim; import com.android.launcher3.graphics.OverviewScrim;
import com.android.launcher3.statehandlers.DepthController; import com.android.launcher3.statehandlers.DepthController;
@@ -67,7 +69,7 @@ public class StaggeredWorkspaceAnim {
private final AnimatorSet mAnimators = new AnimatorSet(); private final AnimatorSet mAnimators = new AnimatorSet();
public StaggeredWorkspaceAnim(Launcher launcher, float velocity, boolean animateOverviewScrim) { public StaggeredWorkspaceAnim(Launcher launcher, float velocity, boolean animateOverviewScrim) {
prepareToAnimate(launcher); prepareToAnimate(launcher, animateOverviewScrim);
mVelocity = velocity; mVelocity = velocity;
@@ -129,8 +131,9 @@ public class StaggeredWorkspaceAnim {
} }
if (animateOverviewScrim) { if (animateOverviewScrim) {
addScrimAnimationForState(launcher, BACKGROUND_APP, 0); PendingAnimation pendingAnimation = new PendingAnimation(ALPHA_DURATION_MS);
addScrimAnimationForState(launcher, NORMAL, ALPHA_DURATION_MS); addScrimAnimationForState(launcher, NORMAL, pendingAnimation);
mAnimators.play(pendingAnimation.buildAnim());
} }
addDepthAnimationForState(launcher, NORMAL, ALPHA_DURATION_MS); addDepthAnimationForState(launcher, NORMAL, ALPHA_DURATION_MS);
@@ -153,7 +156,7 @@ public class StaggeredWorkspaceAnim {
/** /**
* Setup workspace with 0 duration to prepare for our staggered animation. * Setup workspace with 0 duration to prepare for our staggered animation.
*/ */
private void prepareToAnimate(Launcher launcher) { private void prepareToAnimate(Launcher launcher, boolean animateOverviewScrim) {
StateAnimationConfig config = new StateAnimationConfig(); StateAnimationConfig config = new StateAnimationConfig();
config.animFlags = ANIM_ALL_COMPONENTS | SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER; config.animFlags = ANIM_ALL_COMPONENTS | SKIP_OVERVIEW | SKIP_DEPTH_CONTROLLER;
config.duration = 0; config.duration = 0;
@@ -162,6 +165,10 @@ public class StaggeredWorkspaceAnim {
// Stop scrolling so that it doesn't interfere with the translation offscreen. // Stop scrolling so that it doesn't interfere with the translation offscreen.
launcher.<RecentsView>getOverviewPanel().getScroller().forceFinished(true); launcher.<RecentsView>getOverviewPanel().getScroller().forceFinished(true);
if (animateOverviewScrim) {
addScrimAnimationForState(launcher, BACKGROUND_APP, NO_ANIM_PROPERTY_SETTER);
}
} }
public AnimatorSet getAnimators() { public AnimatorSet getAnimators() {
@@ -224,15 +231,14 @@ public class StaggeredWorkspaceAnim {
mAnimators.play(alpha); mAnimators.play(alpha);
} }
private void addScrimAnimationForState(Launcher launcher, LauncherState state, long duration) { private void addScrimAnimationForState(Launcher launcher, LauncherState state,
PendingAnimation builder = new PendingAnimation(duration); PropertySetter setter) {
launcher.getWorkspace().getStateTransitionAnimation().setScrim(builder, state); launcher.getWorkspace().getStateTransitionAnimation().setScrim(setter, state);
builder.setFloat( setter.setFloat(
launcher.getDragLayer().getOverviewScrim(), launcher.getDragLayer().getOverviewScrim(),
OverviewScrim.SCRIM_PROGRESS, OverviewScrim.SCRIM_PROGRESS,
state.getOverviewScrimAlpha(launcher), state.getOverviewScrimAlpha(launcher),
ACCEL_DEACCEL); ACCEL_DEACCEL);
mAnimators.play(builder.buildAnim());
} }
private void addDepthAnimationForState(Launcher launcher, LauncherState state, long duration) { private void addDepthAnimationForState(Launcher launcher, LauncherState state, long duration) {