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

Commit bea48a57 authored by Michał Brzeziński's avatar Michał Brzeziński Committed by Automerger Merge Worker
Browse files

Merge "Fixing reading shade expansion progress when user pulls from the top of... 

Merge "Fixing reading shade expansion progress when user pulls from the top of lockscreen" into tm-qpr-dev am: bfeb0ef6

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



Change-Id: I3a8eced637952c7c93598fdeb00005bac6ed9239
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 634b9cb6 bfeb0ef6

packages/SystemUI/src/com/android/systemui/shade/NotificationPanelViewController.java

+12 −8
Original line number Diff line number Diff line
@@ -2482,17 +2482,23 @@ public final class NotificationPanelViewController extends PanelViewController { 
        mDepthController.setQsPanelExpansion(qsExpansionFraction);

        mStatusBarKeyguardViewManager.setQsExpansion(qsExpansionFraction);



        // updateQsExpansion will get called whenever mTransitionToFullShadeProgress or

        // mLockscreenShadeTransitionController.getDragProgress change.

        // When in lockscreen, getDragProgress indicates the true expanded fraction of QS

        float shadeExpandedFraction = mTransitioningToFullShadeProgress > 0

                ? mLockscreenShadeTransitionController.getQSDragProgress()

        float shadeExpandedFraction = isOnKeyguard()

                ? getLockscreenShadeDragProgress()

                : getExpandedFraction();

        mLargeScreenShadeHeaderController.setShadeExpandedFraction(shadeExpandedFraction);

        mLargeScreenShadeHeaderController.setQsExpandedFraction(qsExpansionFraction);

        mLargeScreenShadeHeaderController.setQsVisible(mQsVisible);

    }



    private float getLockscreenShadeDragProgress() {

        // mTransitioningToFullShadeProgress > 0 means we're doing regular lockscreen to shade

        // transition. If that's not the case we should follow QS expansion fraction for when

        // user is pulling from the same top to go directly to expanded QS

        return mTransitioningToFullShadeProgress > 0

                ? mLockscreenShadeTransitionController.getQSDragProgress()

                : computeQsExpansionFraction();

    }



    private void onStackYChanged(boolean shouldAnimate) {

        if (mQs != null) {

            if (shouldAnimate) {
@@ -4759,9 +4765,7 @@ public final class NotificationPanelViewController extends PanelViewController { 


                @Override

                public float getLockscreenShadeDragProgress() {

                    return mTransitioningToFullShadeProgress > 0

                            ? mLockscreenShadeTransitionController.getQSDragProgress()

                            : computeQsExpansionFraction();

                    return NotificationPanelViewController.this.getLockscreenShadeDragProgress();

                }

            };