Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c717f48a authored by Fengjiang Li's avatar Fengjiang Li Committed by Android (Google) Code Review
Browse files

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

parents 554c431d 201848bf
Loading
Loading
Loading
Loading
+0 −17
Original line number Diff line number Diff line
@@ -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