PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-27 00:07:30 +00:00
committed by Android (Google) Code Review
parent fa671826e3 8153b69da8
commit 308f356eb4
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityControllerHelper.java
+3
View File
@@ -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
View File
@@ -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();
}