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

Commit 8ce4d0ea authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Restore 1:1 relationship between swipe and shade expansion" into sc-dev... 

Merge "Restore 1:1 relationship between swipe and shade expansion" into sc-dev am: 7043460f am: 2c138981

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

Change-Id: Ie32b261232018aa5a2be51769d5a938897147656
parents e760da8f 2c138981

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

+0 −10
Original line number Diff line number Diff line
@@ -697,16 +697,6 @@ public abstract class PanelViewController { 
        if (isNaN(h)) {

            Log.wtf(TAG, "ExpandedHeight set to NaN");

        }

        if (mAmbientState.isExpansionChanging()

                && !mIsFlinging  // Fling already uses interpolated height from end of swipe

                && !mAmbientState.isOnKeyguard()

                && !mAmbientState.isDozing()

                && !mAmbientState.isPulsing()) {

            final float fraction = h / mView.getHeight();

            final float interpolatedFraction = new PathInterpolator(0.2f, 0.8f, 0.8f, 1f)

                    .getInterpolation(fraction);

            h = interpolatedFraction * mView.getHeight();

        }

        maybeOverScrollForShadeFlingOpen(h);

        if (mExpandLatencyTracking && h != 0f) {

            DejankUtils.postAfterTraversal(