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

Commit 8153b69d authored by Winson Chung's avatar Winson Chung
Browse files

Reset the task's curve scale prior to calculating the recents view scale 

Bug: 131436393
Test: Swipe to next task, before it can settle, touch and start quick
      switching again

Change-Id: I568ec059be4c5c2f8c663980da0931c01d784f1f
parent a0d542b0

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java

+3 −0
Original line number Diff line number Diff line
@@ -308,7 +308,10 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe 
        SCALE_PROPERTY.set(recentsView, targetRvScale);

        recentsView.setTranslationY(0);

        ClipAnimationHelper clipHelper = new ClipAnimationHelper(launcher);

        float tmpCurveScale = v.getCurveScale();

        v.setCurveScale(1f);

        clipHelper.fromTaskThumbnailView(v.getThumbnail(), (RecentsView) v.getParent(), null);

        v.setCurveScale(tmpCurveScale);

        SCALE_PROPERTY.set(recentsView, prevRvScale);

        recentsView.setTranslationY(prevRvTransY);

quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable { 
        return 1 - curveInterpolation * EDGE_SCALE_DOWN_FACTOR;

    }



    private void setCurveScale(float curveScale) {

    public void setCurveScale(float curveScale) {

        mCurveScale = curveScale;

        onScaleChanged();

    }