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

Commit 39c5f697 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am a2e3af9c: Merge "QuickSettings: Fix flash when expanding panel." into lmp-preview-dev 

* commit 'a2e3af9ce16f15a02d198f135321e6cd08daa435':
  QuickSettings: Fix flash when expanding panel.
parents dbce83bf 3a00419a

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

+5 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class NotificationPanelView extends PanelView implements 
     */

    private boolean mIntercepting;

    private boolean mQsExpanded;

    private boolean mQsFullyExpanded;

    private boolean mKeyguardShowing;

    private float mInitialHeightOnTouch;

    private float mInitialTouchX;
@@ -167,7 +168,9 @@ public class NotificationPanelView extends PanelView implements 
        mQsMinExpansionHeight = mHeader.getCollapsedHeight() + mQsPeekHeight;

        mQsMaxExpansionHeight = mHeader.getExpandedHeight() + mQsContainer.getHeight();

        if (mQsExpanded) {

            if (mQsFullyExpanded) {

                setQsStackScrollerPadding(mQsMaxExpansionHeight);

            }

        } else {

            setQsExpansion(mQsMinExpansionHeight);

            positionClockAndNotifications();
@@ -524,6 +527,7 @@ public class NotificationPanelView extends PanelView implements 


    private void setQsExpansion(float height) {

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

        mQsFullyExpanded = height == mQsMaxExpansionHeight;

        if (height > mQsMinExpansionHeight && !mQsExpanded) {

            setQsExpanded(true);

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