Merge "[Predictive Back] Remove animation on cancel for all apps to home" into tm-qpr-dev
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
index f7b0d96..394a7d7 100644
--- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java
+++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java
@@ -277,17 +277,6 @@
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 @@
}
}
- 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