Merge "[Predictive Back] Remove animation on cancel for all apps to home" into tm-qpr-dev

This commit is contained in:
Fengjiang Li
2023-02-03 03:44:19 +00:00
committed by Android (Google) Code Review

View File

@@ -277,17 +277,6 @@ public class AllAppsTransitionController
mAllAppScale.updateValue(scaleProgress);
}
@Override
public void onBackCancelled(LauncherState toState) {
if (!mLauncher.isInState(ALL_APPS) || !NORMAL.equals(toState)) {
return;
}
// TODO: once ag/20649618 is picked into tm-qpr, we don't need to animate back on cancel
// swipe because framework will do that for us in {@link #onBackProgressed}.
animateAllAppsToNoScale();
}
private void onScaleProgressChanged() {
final float scaleProgress = mAllAppScale.value;
SCALE_PROPERTY.set(mLauncher.getAppsView(), scaleProgress);
@@ -312,12 +301,6 @@ public class AllAppsTransitionController
}
}
private void animateAllAppsToNoScale() {
mAllAppScale.animateToValue(1f)
.setDuration(REVERT_SWIPE_ALL_APPS_TO_HOME_ANIMATION_DURATION_MS)
.start();
}
/**
* Creates an animation which updates the vertical transition progress and updates all the
* dependent UI using various animation events