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

Commit 9a776ddd authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[QS] Do not set QS visible when animating away." into tm-dev am:... 

Merge "[QS] Do not set QS visible when animating away." into tm-dev am: e63fb2fd am: 0b3d2c3e am: 5f0a3475 am: d0e55300

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



Change-Id: Ic33b9800d090cb542e647203e6d361501db6d3cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49a8a5a3 d0e55300

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

+2 −1
Original line number Diff line number Diff line
@@ -2315,8 +2315,9 @@ public class NotificationPanelViewController extends PanelViewController { 
    void setQsExpansion(float height) {

        height = Math.min(Math.max(height, mQsMinExpansionHeight), mQsMaxExpansionHeight);

        mQsFullyExpanded = height == mQsMaxExpansionHeight && mQsMaxExpansionHeight != 0;

        boolean qsAnimatingAway = !mQsAnimatorExpand && mAnimatingQS;

        if (height > mQsMinExpansionHeight && !mQsExpanded && !mStackScrollerOverscrolling

                && !mDozing) {

                && !mDozing && !qsAnimatingAway) {

            setQsExpanded(true);

        } else if (height <= mQsMinExpansionHeight && mQsExpanded) {

            setQsExpanded(false);