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

Commit 1d071ce9 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Make sure expandingFinished gets called when going into QS 

Bug: 22351040
Bug: 22306637
Change-Id: I8d1f9fb400b328753bd8444bf3b4a744ad23a53a
parent bf3a24d5

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

+1 −0
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ public class NotificationPanelView extends PanelView implements 
    private void onQsExpansionStarted(int overscrollAmount) {

        cancelQsAnimation();

        cancelHeightAnimator();

        notifyExpandingFinished();



        // Reset scroll position and apply that position to the expanded height.

        float height = mQsExpansionHeight - mScrollView.getScrollY() - overscrollAmount;

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

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public abstract class PanelView extends FrameLayout { 
     */

    private float mNextCollapseSpeedUpFactor = 1.0f;



    private boolean mExpanding;

    protected boolean mExpanding;

    private boolean mGestureWaitForTouchSlop;

    private boolean mIgnoreXTouchSlop;

    private Runnable mPeekRunnable = new Runnable() {
@@ -137,7 +137,7 @@ public abstract class PanelView extends FrameLayout { 
        }

    }



    private void notifyExpandingFinished() {

    protected final void notifyExpandingFinished() {

        if (mExpanding) {

            mExpanding = false;

            onExpandingFinished();