openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bug where scrim did not fade in during staggered workspace animation. 

The problem is that in prepareToAnimate, we set the scrim sysUiProgress to 1.

When we call setScrim(Background) we create an animator to set sysUiProgress
to 0 with a duration of 0. We expect this to set sysUiProgress to 0 prior
to the next animation setScrirm(Normal).

When we call setScrim(Normal) we want to animate sysUiProgress to 1, but it
is still 1 since we haven't actually run the setScrim(Background) animation
(we've only added it to the list of animators). Therefore we don't create an
animator at all since the target is already at the final value.

Bug: 158148281
Change-Id: I8ca7ef00fc8a7dad6813c285ead60f5db15939b6
This commit is contained in:
Jon Miranda 2020-06-08 17:46:56 -07:00
parent f6858198b9
commit 36918c3e12
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java
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) {