diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-06-19 15:37:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-19 15:37:21 +0000 |
| commit | a9a0dd7f3fbe21dfe6691ee54bd8e0c8f80c8c8a (patch) | |
| tree | c98f4029b96e46e7275bd9a0a94a160d0f01a46d /quickstep | |
| parent | 3bd876ba906e2df5873d1bdada0342a145999aef (diff) | |
| parent | dbfe998db9d0e270f5ff722e77bf4b874fd427ff (diff) | |
| download | android_packages_apps_Trebuchet-a9a0dd7f3fbe21dfe6691ee54bd8e0c8f80c8c8a.tar.gz android_packages_apps_Trebuchet-a9a0dd7f3fbe21dfe6691ee54bd8e0c8f80c8c8a.tar.bz2 android_packages_apps_Trebuchet-a9a0dd7f3fbe21dfe6691ee54bd8e0c8f80c8c8a.zip | |
Merge "Fix bug where recents animation is out of sync." into ub-launcher3-qt-dev
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java index d0ea73a6f..6897c1e7d 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskViewUtils.java @@ -29,8 +29,6 @@ import android.view.View; import com.android.launcher3.BaseActivity; import com.android.launcher3.BaseDraggingActivity; import com.android.launcher3.ItemInfo; -import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAppState; import com.android.launcher3.Utilities; import com.android.quickstep.util.ClipAnimationHelper; import com.android.quickstep.util.MultiValueUpdateListener; @@ -123,6 +121,7 @@ public final class TaskViewUtils { new RemoteAnimationTargetSet(targets, MODE_OPENING); targetSet.addDependentTransactionApplier(applier); + final RecentsView recentsView = v.getRecentsView(); final ValueAnimator appAnimator = ValueAnimator.ofFloat(0, 1); appAnimator.setInterpolator(TOUCH_RESPONSE_INTERPOLATOR); appAnimator.addUpdateListener(new MultiValueUpdateListener() { @@ -153,7 +152,10 @@ public final class TaskViewUtils { // TODO: Take into account the current fullscreen progress for animating the insets params.setProgress(1 - percent); RectF taskBounds = inOutHelper.applyTransform(targetSet, params); - if (!skipViewChanges) { + int taskIndex = recentsView.indexOfChild(v); + int centerTaskIndex = recentsView.getCurrentPage(); + boolean parallaxCenterAndAdjacentTask = taskIndex != centerTaskIndex; + if (!skipViewChanges && parallaxCenterAndAdjacentTask) { float scale = taskBounds.width() / mThumbnailRect.width(); v.setScaleX(scale); v.setScaleY(scale); |