diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-29 21:57:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-29 21:57:41 +0000 |
| commit | 1dbec0ef43e7bcf6bb663cd8e7626a245f2a42d5 (patch) | |
| tree | e43d1a213f8a2acc7c7351217cb707027899e33b /quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | |
| parent | fafe347533a122cea89fb1c1e01ab0a93d5fe46f (diff) | |
| parent | 928fc8d1e26b0af9cec86dd12237bed808c19dc2 (diff) | |
| download | android_packages_apps_Trebuchet-1dbec0ef43e7bcf6bb663cd8e7626a245f2a42d5.tar.gz android_packages_apps_Trebuchet-1dbec0ef43e7bcf6bb663cd8e7626a245f2a42d5.tar.bz2 android_packages_apps_Trebuchet-1dbec0ef43e7bcf6bb663cd8e7626a245f2a42d5.zip | |
Merge "Fix bug where shape reveal progress gets started too early." into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java index 187e5317f..0d0478ae0 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -1135,12 +1135,10 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> // FolderIconView can be seen morphing into the icon shape. final float windowAlphaThreshold = isFloatingIconView ? 1f - SHAPE_PROGRESS_DURATION : 1f; anim.addOnUpdateListener((currentRect, progress) -> { - float interpolatedProgress = Interpolators.ACCEL_1_5.getInterpolation(progress); - homeAnim.setPlayFraction(progress); - float windowAlpha = Utilities.mapToRange(interpolatedProgress, 0, - windowAlphaThreshold, 1f, 0f, Interpolators.LINEAR); + float windowAlpha = Math.max(0, Utilities.mapToRange(progress, 0, + windowAlphaThreshold, 1f, 0f, Interpolators.LINEAR)); mTransformParams.setProgress(progress) .setCurrentRectAndTargetAlpha(currentRect, windowAlpha); mClipAnimationHelper.applyTransform(targetSet, mTransformParams, |