From 8153b69da8639a2159168e27dd3650d2b1f7627f Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Fri, 26 Apr 2019 16:41:37 -0700 Subject: [PATCH] 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 --- .../android/quickstep/LauncherActivityControllerHelper.java | 3 +++ .../src/com/android/quickstep/views/TaskView.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java index a033402ffe..3d2659d544 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java @@ -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); diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java index 848c2140fd..298c56268a 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskView.java @@ -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(); }