am 26aa04c3: Fix state weirdness in the panel
* commit '26aa04c3c4d16ab7bf47d414fac697721e5843cd':
Fix state weirdness in the panel
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 56e3032..f8bd793 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -626,6 +626,7 @@
&& shouldQuickSettingsIntercept(mInitialTouchX, mInitialTouchY, h)) {
mQsTracking = true;
onQsExpansionStarted();
+ notifyExpandingFinished();
mInitialHeightOnTouch = mQsExpansionHeight;
mInitialTouchY = y;
mInitialTouchX = x;
@@ -825,9 +826,7 @@
mInitialTouchX = event.getY();
// If we interrupt an expansion gesture here, make sure to update the state correctly.
- if (mIsExpanding) {
- onExpandingFinished();
- }
+ notifyExpandingFinished();
}
}
@@ -970,7 +969,6 @@
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;