| commit | 308f356eb44a19e2e5b532e1803f21be3f1ea98a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Sat Apr 27 00:07:30 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Apr 27 00:07:30 2019 +0000 |
| tree | df3d68d3b4824b2565304fe6badb2e7cc2874aa1 | |
| parent | fa671826e3eb377e438493fe4eb0fcf5b3e0086c [diff] | |
| parent | 8153b69da8639a2159168e27dd3650d2b1f7627f [diff] |
Merge "Reset the task's curve scale prior to calculating the recents view scale" into ub-launcher3-qt-dev
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(); }