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

Commit aee79240 authored by Jon Miranda's avatar Jon Miranda Committed by Sunny Goyal
Browse files

Fix velocity in StaggeredWorkspaceAnimation. 

* Velocity should match the direction of the spring values.
  (Swipe direction is upwards, but icons move downwards on screen).
* Remove additional conversion to pxPerS since getDimension already does that.

Bug: 160003774
Change-Id: I12912edb2354c4a30c538da6ca3789c46d82b94d
(cherry picked from commit 54003963)
parent 36a1600d

quickstep/recents_ui_overrides/src/com/android/quickstep/util/StaggeredWorkspaceAnim.java

+4 −2
Original line number Diff line number Diff line
@@ -205,13 +205,15 @@ public class StaggeredWorkspaceAnim { 
        ResourceProvider rp = DynamicResource.provider(v.getContext());

        float stiffness = rp.getFloat(R.dimen.staggered_stiffness);

        float damping = rp.getFloat(R.dimen.staggered_damping_ratio);

        float endTransY = 0;

        float springVelocity = Math.abs(mVelocity) * Math.signum(endTransY - mSpringTransY);

        ValueAnimator springTransY = new SpringAnimationBuilder(v.getContext())

                .setStiffness(stiffness)

                .setDampingRatio(damping)

                .setMinimumVisibleChange(1f)

                .setStartValue(mSpringTransY)

                .setEndValue(0)

                .setStartVelocity(mVelocity)

                .setEndValue(endTransY)

                .setStartVelocity(springVelocity)

                .build(v, VIEW_TRANSLATE_Y);

        springTransY.setStartDelay(startDelay);

        springTransY.addListener(new AnimatorListenerAdapter() {

quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java

+1 −6
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.launcher3;



import static android.util.TypedValue.COMPLEX_UNIT_DIP;



import static com.android.launcher3.BaseActivity.INVISIBLE_ALL;

import static com.android.launcher3.BaseActivity.INVISIBLE_BY_APP_TRANSITIONS;

import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
@@ -62,7 +60,6 @@ import android.os.CancellationSignal; 
import android.os.Handler;

import android.os.Looper;

import android.util.Pair;

import android.util.TypedValue;

import android.view.View;



import androidx.annotation.NonNull;
@@ -875,10 +872,8 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans 
                            }

                        });

                    } else {

                        float velocityDpPerS = DynamicResource.provider(mLauncher)

                        float velocityPxPerS = DynamicResource.provider(mLauncher)

                                .getDimension(R.dimen.unlock_staggered_velocity_dp_per_s);

                        float velocityPxPerS = TypedValue.applyDimension(COMPLEX_UNIT_DIP,

                                velocityDpPerS, mLauncher.getResources().getDisplayMetrics());

                        anim.play(new StaggeredWorkspaceAnim(mLauncher, velocityPxPerS, false)

                                .getAnimators());

                    }

res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ 


    <item name="staggered_damping_ratio" type="dimen" format="float">0.7</item>

    <item name="staggered_stiffness" type="dimen" format="float">150</item>

    <dimen name="unlock_staggered_velocity_dp_per_s">3dp</dimen>

    <dimen name="unlock_staggered_velocity_dp_per_s">4dp</dimen>



    <item name="hint_scale_damping_ratio" type="dimen" format="float">0.7</item>

    <item name="hint_scale_stiffness" type="dimen" format="float">200</item>