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

Commit 98c8dcf7 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Only dispatch onMove event to BackAnimation in one place." into tm-qpr-dev am: bbccf67e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19499676



Change-Id: I32a0a5a4e763dbf836e7d1dfbede719071060d7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf171f00 bbccf67e

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/BackPanelController.kt

+1 −2
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ import com.android.systemui.plugins.NavigationEdgeBackPlugin 
import com.android.systemui.statusbar.VibratorHelper

import com.android.systemui.statusbar.policy.ConfigurationController

import com.android.systemui.util.ViewController

import com.android.wm.shell.back.BackAnimation

import java.io.PrintWriter

import javax.inject.Inject

import kotlin.math.abs
@@ -119,7 +118,7 @@ class BackPanelController private constructor( 
        private val latencyTracker: LatencyTracker

    ) {

        /** Construct a [BackPanelController].  */

        fun create(context: Context, backAnimation: BackAnimation?): BackPanelController {

        fun create(context: Context): BackPanelController {

            val backPanelController = BackPanelController(

                context,

                windowManager,

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/EdgeBackGestureHandler.java

+2 −2
Original line number Diff line number Diff line
@@ -574,10 +574,10 @@ public class EdgeBackGestureHandler extends CurrentUserTracker 
    private void resetEdgeBackPlugin() {

        if (mIsNewBackAffordanceEnabled) {

            setEdgeBackPlugin(

                    mBackPanelControllerFactory.create(mContext, mBackAnimation));

                    mBackPanelControllerFactory.create(mContext));

        } else {

            setEdgeBackPlugin(

                    new NavigationBarEdgePanel(mContext, mBackAnimation, mLatencyTracker));

                    new NavigationBarEdgePanel(mContext, mLatencyTracker));

        }

    }

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationBarEdgePanel.java

+1 −27
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.view.View; 
import android.view.WindowManager;

import android.view.animation.Interpolator;

import android.view.animation.PathInterpolator;

import android.window.BackEvent;



import androidx.core.graphics.ColorUtils;

import androidx.dynamicanimation.animation.DynamicAnimation;
@@ -59,7 +58,6 @@ import com.android.systemui.animation.Interpolators; 
import com.android.systemui.plugins.NavigationEdgeBackPlugin;

import com.android.systemui.shared.navigationbar.RegionSamplingHelper;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.wm.shell.back.BackAnimation;



import java.io.PrintWriter;

import java.util.concurrent.Executor;
@@ -283,14 +281,11 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
                }

            };

    private BackCallback mBackCallback;

    private BackAnimation mBackAnimation;



    public NavigationBarEdgePanel(Context context,

            BackAnimation backAnimation, LatencyTracker latencyTracker) {

    public NavigationBarEdgePanel(Context context, LatencyTracker latencyTracker) {

        super(context);



        mWindowManager = context.getSystemService(WindowManager.class);

        mBackAnimation = backAnimation;

        mVibratorHelper = Dependency.get(VibratorHelper.class);



        mDensity = context.getResources().getDisplayMetrics().density;
@@ -360,7 +355,6 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
                .getDimension(R.dimen.navigation_edge_action_drag_threshold);

        mSwipeProgressThreshold = context.getResources()

                .getDimension(R.dimen.navigation_edge_action_progress_threshold);

        initializeBackAnimation();



        setVisibility(GONE);
@@ -388,17 +382,6 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
        mLatencyTracker = latencyTracker;

    }



    public void setBackAnimation(BackAnimation backAnimation) {

        mBackAnimation = backAnimation;

        initializeBackAnimation();

    }



    private void initializeBackAnimation() {

        if (mBackAnimation != null) {

            mBackAnimation.setSwipeThresholds(mSwipeTriggerThreshold, mSwipeProgressThreshold);

        }

    }



    @Override

    public void onDestroy() {

        cancelFailsafe();
@@ -484,12 +467,6 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 


    @Override

    public void onMotionEvent(MotionEvent event) {

        if (mBackAnimation != null) {

            mBackAnimation.onBackMotion(

                    event.getX(), event.getY(),

                    event.getActionMasked(),

                    mIsLeftPanel ? BackEvent.EDGE_LEFT : BackEvent.EDGE_RIGHT);

        }

        if (mVelocityTracker == null) {

            mVelocityTracker = VelocityTracker.obtain();

        }
@@ -903,9 +880,6 @@ public class NavigationBarEdgePanel extends View implements NavigationEdgeBackPl 
            // Whenever the trigger back state changes the existing translation animation should be

            // cancelled

            mTranslationAnimation.cancel();

            if (mBackAnimation != null) {

                mBackAnimation.setTriggerBack(triggerBack);

            }

        }

    }