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

Commit 308f356e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

Merge "Reset the task's curve scale prior to calculating the recents view scale" into ub-launcher3-qt-dev
parents fa671826 8153b69d

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();

    }