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

Commit e2053796 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix scrim flashing when no security is set."

parents 3c98b6e6 93439da0

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

+2 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ public abstract class PanelView extends FrameLayout { 
                        onTrackingStarted();

                    }

                }

                final float newHeight = h + mInitialOffsetOnTouch;

                final float newHeight = Math.max(0, h + mInitialOffsetOnTouch);

                if (newHeight > mPeekHeight) {

                    if (mPeekAnimator != null) {

                        mPeekAnimator.cancel();
@@ -565,6 +565,7 @@ public abstract class PanelView extends FrameLayout { 
            }

        }



        mExpandedHeight = Math.max(0, mExpandedHeight);

        onHeightUpdated(mExpandedHeight);

        mExpandedFraction = Math.min(1f, fhWithoutOverExpansion == 0

                ? 0

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

+4 −2
Original line number Diff line number Diff line
@@ -94,9 +94,11 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener { 
    }



    public void setPanelExpansion(float fraction) {

        if (mFraction != fraction) {

            mFraction = fraction;

            scheduleUpdate();

        }

    }



    public void setBouncerShowing(boolean showing) {

        mBouncerShowing = showing;