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

Commit 3ad2e4e3 authored by Jon Miranda's avatar Jon Miranda
Browse files

Cleanup dead code from old all close prototype. 

Bug: 209856611
Test: compiled
Change-Id: Ie94587467442ea00f949241fec41d10fb8c5a527
parent a42f658a

quickstep/src/com/android/quickstep/LauncherSwipeHandlerV2.java

+0 −59
Original line number Diff line number Diff line
@@ -15,10 +15,7 @@ 
 */

package com.android.quickstep;



import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY;

import static com.android.launcher3.LauncherAnimUtils.VIEW_TRANSLATE_Y;

import static com.android.launcher3.LauncherState.NORMAL;

import static com.android.launcher3.Utilities.dpToPx;

import static com.android.launcher3.Utilities.mapBoundToRange;

import static com.android.launcher3.anim.Interpolators.EXAGGERATED_EASE;

import static com.android.launcher3.anim.Interpolators.LINEAR;
@@ -26,10 +23,7 @@ import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID; 
import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;

import static com.android.launcher3.views.FloatingIconView.getFloatingIconView;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.AnimatorSet;

import android.animation.ValueAnimator;

import android.content.Context;

import android.graphics.Rect;

import android.graphics.RectF;
@@ -42,15 +36,9 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;



import com.android.launcher3.BaseQuickstepLauncher;

import com.android.launcher3.Hotseat;

import com.android.launcher3.LauncherState;

import com.android.launcher3.R;

import com.android.launcher3.Workspace;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.SpringAnimationBuilder;

import com.android.launcher3.dragndrop.DragLayer;

import com.android.launcher3.states.StateAnimationConfig;

import com.android.launcher3.util.DynamicResource;

import com.android.launcher3.util.ObjectWrapper;

import com.android.launcher3.views.FloatingIconView;

import com.android.launcher3.views.FloatingView;
@@ -60,7 +48,6 @@ import com.android.quickstep.util.StaggeredWorkspaceAnim; 
import com.android.quickstep.views.FloatingWidgetView;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

import com.android.systemui.plugins.ResourceProvider;

import com.android.systemui.shared.system.InputConsumerController;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;
@@ -257,61 +244,15 @@ public class LauncherSwipeHandlerV2 extends 


    private class FloatingViewHomeAnimationFactory extends LauncherHomeAnimationFactory {



        private final float mTransY;

        private final FloatingView mFloatingView;

        private ValueAnimator mBounceBackAnimator;



        FloatingViewHomeAnimationFactory(FloatingView floatingView) {

            mFloatingView = floatingView;



            ResourceProvider rp = DynamicResource.provider(mActivity);

            mTransY = dpToPx(rp.getFloat(R.dimen.swipe_up_trans_y_dp));

        }



        @Override

        public boolean shouldPlayAtomicWorkspaceReveal() {

            return false;

        }



        protected void bounceBackToRestingPosition() {

            final float startValue = mTransY;

            final float endValue = 0;

            // Ensures the velocity is always aligned with the direction.

            float pixelPerSecond = Math.abs(mSwipeVelocity) * Math.signum(endValue - mTransY);



            DragLayer dl = mActivity.getDragLayer();

            Workspace workspace = mActivity.getWorkspace();

            Hotseat hotseat = mActivity.getHotseat();



            ResourceProvider rp = DynamicResource.provider(mActivity);

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

                    .setStiffness(rp.getFloat(R.dimen.swipe_up_trans_y_stiffness))

                    .setDampingRatio(rp.getFloat(R.dimen.swipe_up_trans_y_damping))

                    .setMinimumVisibleChange(1f)

                    .setStartValue(startValue)

                    .setEndValue(endValue)

                    .setStartVelocity(pixelPerSecond)

                    .build(dl, VIEW_TRANSLATE_Y);

            springTransY.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {

                    dl.setTranslationY(0f);

                    dl.setAlpha(1f);

                    SCALE_PROPERTY.set(workspace, 1f);

                    SCALE_PROPERTY.set(hotseat, 1f);

                }

            });



            mBounceBackAnimator = springTransY;

            mBounceBackAnimator.start();

        }



        @Override

        public void onCancel() {

            mFloatingView.fastFinish();

            if (mBounceBackAnimator != null) {

                mBounceBackAnimator.cancel();

            }

        }

    }

quickstep/src/com/android/quickstep/SwipeUpAnimationLogic.java

+0 −4
Original line number Diff line number Diff line
@@ -177,10 +177,6 @@ public abstract class SwipeUpAnimationLogic implements 
            // No-op

        }



        public boolean shouldPlayAtomicWorkspaceReveal() {

            return true;

        }



        public void setAnimation(RectFSpringAnim anim) { }



        public void update(RectF currentRect, float progress, float radius) { }

res/values/config.xml

+0 −16
Original line number Diff line number Diff line
@@ -139,19 +139,9 @@ 


    <item name="swipe_up_scale_start"  type="dimen" format="float">0.88</item>



    <item name="swipe_up_trans_y_dp"  type="dimen" format="float">4.5</item>

    <item name="swipe_up_trans_y_dp_per_s" type="dimen" format="float">3</item>



    <item name="swipe_up_trans_y_damping" type="dimen" format="float">0.45</item>

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



    <item name="swipe_up_rect_xy_damping_ratio" type="dimen" format="float">0.8</item>

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



    <item name="swipe_up_low_swipe_duration_multiplier"  type="dimen" format="float">1</item>



    <item name="swipe_up_launcher_alpha_max_progress" type="dimen" format="float">0.85</item>



    <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">2dp</dimen>
@@ -167,12 +157,6 @@ 


    <array name="dynamic_resources">

        <item>@dimen/swipe_up_scale_start</item>

        <item>@dimen/swipe_up_trans_y_dp</item>

        <item>@dimen/swipe_up_trans_y_dp_per_s</item>

        <item>@dimen/swipe_up_trans_y_damping</item>

        <item>@dimen/swipe_up_trans_y_stiffness</item>

        <item>@dimen/swipe_up_launcher_alpha_max_progress</item>

        <item>@dimen/swipe_up_low_swipe_duration_multiplier</item>

        <item>@dimen/swipe_up_max_velocity</item>

    </array>