diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-03 07:26:36 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-06-03 07:26:36 +0000 |
| commit | 73859d052104d841fdb8560e49d8a46c5bff93b1 (patch) | |
| tree | 58cf13d9da0fde15896d03148bfece106ad78f61 /quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java | |
| parent | df0843e569b93e77355990f7a71fe39746b43493 (diff) | |
| parent | bf29023212a107481b6cbf3dbe4fda52c6f50180 (diff) | |
| download | android_packages_apps_Trebuchet-73859d052104d841fdb8560e49d8a46c5bff93b1.tar.gz android_packages_apps_Trebuchet-73859d052104d841fdb8560e49d8a46c5bff93b1.tar.bz2 android_packages_apps_Trebuchet-73859d052104d841fdb8560e49d8a46c5bff93b1.zip | |
Snap for 4818534 from bf29023212a107481b6cbf3dbe4fda52c6f50180 to pi-releaselineage-16.0_20181101
Change-Id: I06c92e93af46c5f35d997815ed1392cca2f05c46
Diffstat (limited to 'quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java')
| -rw-r--r-- | quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java index e3aabd6c8..ea27eb25b 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java @@ -76,15 +76,16 @@ public class RecentsViewStateController implements StateHandler { } PropertySetter setter = config.getPropertySetter(builder); float[] scaleTranslationYFactor = toState.getOverviewScaleAndTranslationYFactor(mLauncher); - Interpolator scaleInterpolator = builder.getInterpolator(ANIM_OVERVIEW_SCALE, LINEAR); - setter.setFloat(mRecentsView, SCALE_PROPERTY, scaleTranslationYFactor[0], scaleInterpolator); - Interpolator transYInterpolator = scaleInterpolator; + Interpolator scaleAndTransYInterpolator = builder.getInterpolator( + ANIM_OVERVIEW_SCALE, LINEAR); if (mLauncher.getStateManager().getState() == OVERVIEW && toState == FAST_OVERVIEW) { - transYInterpolator = Interpolators.clampToProgress(QUICK_SCRUB_START_INTERPOLATOR, 0, - QUICK_SCRUB_TRANSLATION_Y_FACTOR); + scaleAndTransYInterpolator = Interpolators.clampToProgress( + QUICK_SCRUB_START_INTERPOLATOR, 0, QUICK_SCRUB_TRANSLATION_Y_FACTOR); } + setter.setFloat(mRecentsView, SCALE_PROPERTY, scaleTranslationYFactor[0], + scaleAndTransYInterpolator); setter.setFloat(mRecentsView, TRANSLATION_Y_FACTOR, scaleTranslationYFactor[1], - transYInterpolator); + scaleAndTransYInterpolator); setter.setFloat(mRecentsViewContainer, CONTENT_ALPHA, toState.overviewUi ? 1 : 0, builder.getInterpolator(ANIM_OVERVIEW_FADE, AGGRESSIVE_EASE_IN_OUT)); |