diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-06-26 20:21:09 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-06-26 20:21:09 +0000 |
| commit | 012dad75231a3b3b024173b9a8d96e2bf09e68fe (patch) | |
| tree | ea080f0d16c24fae4d02e2c3cc0e1a914190930e /quickstep | |
| parent | a39ad8044a7bb7467698ec74b90fa653b1ed2d6a (diff) | |
| parent | 5023771e05f0a64177dfeb2a545394ed4c63e9d1 (diff) | |
| download | android_packages_apps_Trebuchet-012dad75231a3b3b024173b9a8d96e2bf09e68fe.tar.gz android_packages_apps_Trebuchet-012dad75231a3b3b024173b9a8d96e2bf09e68fe.tar.bz2 android_packages_apps_Trebuchet-012dad75231a3b3b024173b9a8d96e2bf09e68fe.zip | |
[automerger] Revert "Tune app closing/launcher resume animation "spring" values." am: 5023771e05
Change-Id: I7216325a14ad1328311eecc59e7c99f79dc54521
Diffstat (limited to 'quickstep')
| -rw-r--r-- | quickstep/res/values/dimens.xml | 3 | ||||
| -rw-r--r-- | quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java | 18 |
2 files changed, 10 insertions, 11 deletions
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 675b26112..17d5c60ba 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -33,8 +33,7 @@ <!-- Launcher app transition --> <dimen name="content_trans_y">50dp</dimen> - <dimen name="springs_start_slide_trans_y">-100dp</dimen> - <dimen name="springs_end_slide_trans_y">6.25dp</dimen> + <dimen name="springs_trans_y">-70dp</dimen> <dimen name="closing_window_trans_y">115dp</dimen> <dimen name="recents_empty_message_text_size">16sp</dimen> diff --git a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java index b9ff28456..252e3eaee 100644 --- a/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java +++ b/quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java @@ -125,13 +125,13 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag // Progress = 0: All apps is fully pulled up, Progress = 1: All apps is fully pulled down. public static final float ALL_APPS_PROGRESS_OFF_SCREEN = 1.3059858f; - private static final int APP_CLOSE_ROW_START_DELAY_MS = 9; + private static final int APP_CLOSE_ROW_START_DELAY_MS = 8; - private static final int SPRING_SLIDE_DURATION = 170; - private static final int SPRING_OSCILLATE_DURATION = 550; - private static final int SPRING_SETTLE_DURATION = 25; - - private static final int SPRING_ALPHA_DURATION = 100; + // The sum of [slide, oscillate, and settle] should be <= LAUNCHER_RESUME_TOTAL_DURATION. + private static final int LAUNCHER_RESUME_TOTAL_DURATION = 346; + private static final int SPRING_SLIDE_DURATION = 166; + private static final int SPRING_OSCILLATE_DURATION = 130; + private static final int SPRING_SETTLE_DURATION = 50; private final Launcher mLauncher; private final DragLayer mDragLayer; @@ -173,8 +173,8 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag Resources res = mLauncher.getResources(); mContentTransY = res.getDimensionPixelSize(R.dimen.content_trans_y); mClosingWindowTransY = res.getDimensionPixelSize(R.dimen.closing_window_trans_y); - mStartSlideTransY = res.getDimensionPixelSize(R.dimen.springs_start_slide_trans_y); - mEndSlideTransY = res.getDimensionPixelSize(R.dimen.springs_end_slide_trans_y); + mStartSlideTransY = res.getDimensionPixelSize(R.dimen.springs_trans_y); + mEndSlideTransY = -mStartSlideTransY * 0.1f; mLauncher.addOnDeviceProfileChangeListener(this); registerRemoteAnimations(); @@ -837,7 +837,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag v.setAlpha(0); ObjectAnimator alpha = ObjectAnimator.ofFloat(v, View.ALPHA, 1f); alpha.setInterpolator(LINEAR); - alpha.setDuration(SPRING_ALPHA_DURATION); + alpha.setDuration(SPRING_SLIDE_DURATION + SPRING_OSCILLATE_DURATION); alpha.setStartDelay(startDelay); outAnimator.play(alpha); |