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

Commit 214fd13e authored by Zak Cohen's avatar Zak Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fix jank in back indicator."

parents fdbd9a32 dbf8c92c

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarEdgePanel.java

+13 −4
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ public class NavigationBarEdgePanel extends View { 
        lp.accessibilityTitle = context.getString(R.string.nav_bar_edge_panel);

        lp.accessibilityTitle = context.getString(R.string.nav_bar_edge_panel);

        lp.windowAnimations = 0;

        lp.windowAnimations = 0;

        NavigationBarEdgePanel panel = new NavigationBarEdgePanel(

        NavigationBarEdgePanel panel = new NavigationBarEdgePanel(

                context, (gravity & Gravity.LEFT) != 0);

                context, (gravity & Gravity.LEFT) == Gravity.LEFT);

        panel.setLayoutParams(lp);

        panel.setLayoutParams(lp);

        return panel;

        return panel;

    }

    }
@@ -269,12 +269,21 @@ public class NavigationBarEdgePanel extends View { 
                dist));

                dist));





        if (dist < mGestureLength) {

        if (dist < mGestureLength) {

            setLegProgress(MathUtils.constrainedMap(

            float calculatedLegProgress = MathUtils.constrainedMap(

                    0f, POINTEDNESS_BEFORE_SNAP_RATIO,

                    0f, POINTEDNESS_BEFORE_SNAP_RATIO,

                    mGestureLength * START_POINTING_RATIO, mGestureLength,

                    mGestureLength * START_POINTING_RATIO, mGestureLength,

                    dist));

                    dist);



            // Blend animated value with drag calculated value, allow the gesture to continue

            // while the animation is playing with jump cuts in the animation.

            setLegProgress(MathUtils.lerp(calculatedLegProgress, mLegProgress, mDragProgress));





            if (mGestureDetected) {

                mGestureDetected = false;

                mGestureDetected = false;



                mLegAnimator.setFloatValues(POINTEDNESS_BEFORE_SNAP_RATIO);

                mLegAnimator.start();

            }

        } else {

        } else {

            if (!mGestureDetected) {

            if (!mGestureDetected) {

                performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK);

                performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK);