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

Commit 25850214 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Apply correct squishiness when dragging down on LS"

parents 37522072 e4918c2b

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

+9 −3
Original line number Diff line number Diff line
@@ -2443,9 +2443,15 @@ public class NotificationPanelViewController extends PanelViewController { 


    private void updateQsExpansion() {

        if (mQs == null) return;

        final float squishiness =

                mQsExpandImmediate || mQsExpanded ? 1f : mNotificationStackScrollLayoutController

        final float squishiness;

        if (mQsExpandImmediate || mQsExpanded) {

            squishiness = 1;

        } else if (mLockscreenShadeTransitionController.getQSDragProgress() > 0) {

            squishiness = mLockscreenShadeTransitionController.getQSDragProgress();

        } else {

            squishiness = mNotificationStackScrollLayoutController

                    .getNotificationSquishinessFraction();

        }

        final float qsExpansionFraction = computeQsExpansionFraction();

        final float adjustedExpansionFraction = mShouldUseSplitNotificationShade

                ? 1f : computeQsExpansionFraction();