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

Commit 83e8ef0e authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Fix flickering when swiping up" into qt-dev am: 53317d29 

am: d98570a7

Change-Id: I407cf61252d94666105df6bf0571efeb5679af40
parents 1d19fb5c d98570a7

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

+2 −1
Original line number Diff line number Diff line
@@ -1709,7 +1709,8 @@ public class NotificationPanelView extends PanelView implements 
            min = Math.max(min, minHeight);

        }

        int maxHeight;

        if (mQsExpandImmediate || mQsExpanded || mIsExpanding && mQsExpandedWhenExpandingStarted) {

        if (mQsExpandImmediate || mQsExpanded || mIsExpanding && mQsExpandedWhenExpandingStarted

                || mPulsing) {

            maxHeight = calculatePanelHeightQsExpanded();

        } else {

            maxHeight = calculatePanelHeightShade();