Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd924b47 authored by Andy Wickham's avatar Andy Wickham Committed by Android (Google) Code Review
Browse files

Merge "Use DECELERATED_EASE for workspace scale for all apps on tablet." into udc-qpr-dev

parents b6a32d13 17ef3bde

src/com/android/launcher3/touch/AllAppsSwipeController.java

+5 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.launcher3.touch;



import static com.android.app.animation.Interpolators.DECELERATED_EASE;

import static com.android.app.animation.Interpolators.EMPHASIZED;

import static com.android.app.animation.Interpolators.EMPHASIZED_ACCELERATE;

import static com.android.app.animation.Interpolators.EMPHASIZED_DECELERATE;
@@ -211,8 +212,8 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { 
            if (!config.userControlled) {

                config.setInterpolator(ANIM_VERTICAL_PROGRESS, EMPHASIZED);

            }

            config.setInterpolator(ANIM_WORKSPACE_SCALE, EMPHASIZED);

            config.setInterpolator(ANIM_DEPTH, EMPHASIZED);

            config.setInterpolator(ANIM_WORKSPACE_SCALE, DECELERATED_EASE);

            config.setInterpolator(ANIM_DEPTH, DECELERATED_EASE);

        } else {

            if (config.userControlled) {

                config.setInterpolator(ANIM_DEPTH, Interpolators.reverse(BLUR_MANUAL));
@@ -252,8 +253,8 @@ public class AllAppsSwipeController extends AbstractStateChangeTouchController { 
            if (!config.userControlled) {

                config.setInterpolator(ANIM_VERTICAL_PROGRESS, EMPHASIZED);

            }

            config.setInterpolator(ANIM_WORKSPACE_SCALE, EMPHASIZED);

            config.setInterpolator(ANIM_DEPTH, EMPHASIZED);

            config.setInterpolator(ANIM_WORKSPACE_SCALE, DECELERATED_EASE);

            config.setInterpolator(ANIM_DEPTH, DECELERATED_EASE);

        } else {

            config.setInterpolator(ANIM_DEPTH, config.userControlled ? BLUR_MANUAL : BLUR_ATOMIC);

            config.setInterpolator(ANIM_WORKSPACE_FADE,