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

Commit a51ce2d0 authored by Omar Miatello's avatar Omar Miatello Committed by Automerger Merge Worker
Browse files

Merge "Base: Remove unused triggerThreshold field" into udc-dev am: f636d7c5 am: fe4507e7 

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



Change-Id: I18ef5eba1abddf2e7b5ede92274e58f824b0abaf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 76c5168a fe4507e7

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimation.java

+2 −3
Original line number Diff line number Diff line
@@ -55,10 +55,9 @@ public interface BackAnimation { 


    /**

     * Sets the threshold values that defining edge swipe behavior.

     * @param triggerThreshold the min threshold to trigger back.

     * @param progressThreshold the max threshold to keep progressing back animation.

     * @param progressThreshold the max threshold to keep linear progressing back animation.

     */

    void setSwipeThresholds(float triggerThreshold, float progressThreshold);

    void setSwipeThresholds(float progressThreshold);



    /**

     * Sets the system bar listener to control the system bar color.

libs/WindowManager/Shell/src/com/android/wm/shell/back/BackAnimationController.java

+3 −3
Original line number Diff line number Diff line
@@ -301,9 +301,9 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
        }



        @Override

        public void setSwipeThresholds(float triggerThreshold, float progressThreshold) {

        public void setSwipeThresholds(float progressThreshold) {

            mShellExecutor.execute(() -> BackAnimationController.this.setSwipeThresholds(

                    triggerThreshold, progressThreshold));

                    progressThreshold));

        }



        @Override
@@ -605,7 +605,7 @@ public class BackAnimationController implements RemoteCallable<BackAnimationCont 
        mTouchTracker.setTriggerBack(triggerBack);

    }



    private void setSwipeThresholds(float triggerThreshold, float progressThreshold) {

    private void setSwipeThresholds(float progressThreshold) {

        mTouchTracker.setProgressThreshold(progressThreshold);

    }

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

+0 −5
Original line number Diff line number Diff line
@@ -227,8 +227,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
    private float mBottomGestureHeight;

    // The slop to distinguish between horizontal and vertical motion

    private float mTouchSlop;

    // The threshold for triggering back

    private float mBackSwipeTriggerThreshold;

    // The threshold for back swipe full progress.

    private float mBackSwipeProgressThreshold;

    // Duration after which we consider the event as longpress.
@@ -519,8 +517,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
        final float backGestureSlop = DeviceConfig.getFloat(DeviceConfig.NAMESPACE_SYSTEMUI,

                        SystemUiDeviceConfigFlags.BACK_GESTURE_SLOP_MULTIPLIER, 0.75f);

        mTouchSlop = mViewConfiguration.getScaledTouchSlop() * backGestureSlop;

        mBackSwipeTriggerThreshold = res.getDimension(

                R.dimen.navigation_edge_action_drag_threshold);

        mBackSwipeProgressThreshold = res.getDimension(

                R.dimen.navigation_edge_action_progress_threshold);

        updateBackAnimationThresholds();
@@ -1187,7 +1183,6 @@ public class EdgeBackGestureHandler implements PluginListener<NavigationEdgeBack 
            return;

        }

        mBackAnimation.setSwipeThresholds(

                mBackSwipeTriggerThreshold,

                Math.min(mDisplaySize.x, mBackSwipeProgressThreshold));

    }