diff options
| author | Tony Wickham <twickham@google.com> | 2018-03-15 23:54:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-15 23:54:56 +0000 |
| commit | 39b5534b96a889393b3bafd84dda6333ea8eb157 (patch) | |
| tree | 4d628688c39470e990d5da1ae2c21b2ceae097d0 /quickstep | |
| parent | 4f521af2878d9b6cc0ecded9da54f72d7c8a730e (diff) | |
| parent | b8f7d9a3ad64c27accea4abc660d63636e4757b9 (diff) | |
| download | android_packages_apps_Trebuchet-39b5534b96a889393b3bafd84dda6333ea8eb157.tar.gz android_packages_apps_Trebuchet-39b5534b96a889393b3bafd84dda6333ea8eb157.tar.bz2 android_packages_apps_Trebuchet-39b5534b96a889393b3bafd84dda6333ea8eb157.zip | |
Merge "Small updates for recents launch animation" into ub-launcher3-master
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 849719191..e61e35958 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -34,7 +34,7 @@ <!-- Launcher app transition --> <dimen name="content_trans_y">25dp</dimen> <dimen name="workspace_trans_y">80dp</dimen> - <dimen name="recents_adjacent_trans_x">120dp</dimen> + <dimen name="recents_adjacent_trans_x">140dp</dimen> <dimen name="recents_adjacent_trans_y">80dp</dimen> <fraction name="recents_adjacent_scale">150%</fraction> </resources> diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java index ba0cbfa77..a7e75bf58 100644 --- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java @@ -372,26 +372,24 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag } else { // We are launching an adjacent task, so parallax the center and other adjacent task. TaskView centerTask = (TaskView) recentsView.getPageAt(centerTaskIndex); - float translationX = Math.abs(v.getTranslationX()); - ObjectAnimator centerTaskParallaxToRight = + float translationX = mRecentsTransX / 2; + ObjectAnimator centerTaskParallaxOffscreen = LauncherAnimUtils.ofPropertyValuesHolder(centerTask, new PropertyListBuilder() - .scale(v.getScaleX()) .translationX(isRtl ? -translationX : translationX) .build()); - launcherAnimator.play(centerTaskParallaxToRight); + launcherAnimator.play(centerTaskParallaxOffscreen); int otherAdjacentTaskIndex = centerTaskIndex + (centerTaskIndex - launchedTaskIndex); if (otherAdjacentTaskIndex >= 0 && otherAdjacentTaskIndex < recentsView.getPageCount()) { TaskView otherAdjacentTask = (TaskView) recentsView.getPageAt( otherAdjacentTaskIndex); - ObjectAnimator otherAdjacentTaskParallaxToRight = + ObjectAnimator otherAdjacentTaskParallaxOffscreen = LauncherAnimUtils.ofPropertyValuesHolder(otherAdjacentTask, new PropertyListBuilder() - .translationX(otherAdjacentTask.getTranslationX() - + (isRtl ? -translationX : translationX)) + .translationX(isRtl ? -translationX : translationX) .build()); - launcherAnimator.play(otherAdjacentTaskParallaxToRight); + launcherAnimator.play(otherAdjacentTaskParallaxOffscreen); } } |