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

Commit 90fa59b1 authored by Selim Cinek's avatar Selim Cinek Committed by Automerger Merge Worker
Browse files

Merge "Fixed an issue where the qs position was wrong while bypassing" into sc-dev am: 2ce2914c 

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

Change-Id: I573dc97c5467445776ddb0072a462cd4968076fb
parents 55deece9 2ce2914c

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

+12 −9
Original line number Diff line number Diff line
@@ -2574,8 +2574,8 @@ public class NotificationPanelViewController extends PanelViewController { 
            // Small parallax as we pull down and clip QS

            startHeight = -mQsExpansionHeight * 0.2f;

        }

        if (mKeyguardBypassController.getBypassEnabled() && isOnKeyguard()

                && mNotificationStackScrollLayoutController.isPulseExpanding()) {

        if (mKeyguardBypassController.getBypassEnabled() && isOnKeyguard()) {

            if (mNotificationStackScrollLayoutController.isPulseExpanding()) {

                if (!mPulseExpansionHandler.isExpanding()

                        && !mPulseExpansionHandler.getLeavingLockscreen()) {

                    // If we aborted the expansion we need to make sure the header doesn't reappear
@@ -2585,6 +2585,9 @@ public class NotificationPanelViewController extends PanelViewController { 
                    appearAmount = mNotificationStackScrollLayoutController

                            .calculateAppearFractionBypass();

                }

            } else {

                appearAmount = 0.0f;

            }

            startHeight = -mQs.getQsMinExpansionHeight();

        }

        float translation = MathUtils.lerp(startHeight, 0, Math.min(1.0f, appearAmount));