| commit | 3323b68a994789e5fe53f94b03efba10c5691458 | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Fri Apr 26 17:16:47 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Apr 26 17:16:47 2019 -0700 |
| tree | df3d68d3b4824b2565304fe6badb2e7cc2874aa1 | |
| parent | e7556b524d063da6c22ea6acc3ce6d56c77d3237 [diff] | |
| parent | 308f356eb44a19e2e5b532e1803f21be3f1ea98a [diff] |
Merge "Reset the task's curve scale prior to calculating the recents view scale" into ub-launcher3-qt-dev am: 308f356eb4 Change-Id: Ib1bf7b2fe675ffa2d534d7d70199481ff9c16247
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 a033402..3d2659d 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 @@ 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 848c214..298c562 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 @@ return 1 - curveInterpolation * EDGE_SCALE_DOWN_FACTOR; } - private void setCurveScale(float curveScale) { + public void setCurveScale(float curveScale) { mCurveScale = curveScale; onScaleChanged(); }