am 8e43c3e7: am 26aa04c3: Fix state weirdness in the panel (cd6e8015) · Commits · e / os / android_frameworks_base

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

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -626,6 +626,7 @@ public class NotificationPanelView extends PanelView implements
	&& shouldQuickSettingsIntercept(mInitialTouchX, mInitialTouchY, h)) {		&& shouldQuickSettingsIntercept(mInitialTouchX, mInitialTouchY, h)) {
	mQsTracking = true;		mQsTracking = true;
	onQsExpansionStarted();		onQsExpansionStarted();
			notifyExpandingFinished();
	mInitialHeightOnTouch = mQsExpansionHeight;		mInitialHeightOnTouch = mQsExpansionHeight;
	mInitialTouchY = y;		mInitialTouchY = y;
	mInitialTouchX = x;		mInitialTouchX = x;
	@@ -825,9 +826,7 @@ public class NotificationPanelView extends PanelView implements
	mInitialTouchX = event.getY();		mInitialTouchX = event.getY();

	// If we interrupt an expansion gesture here, make sure to update the state correctly.		// If we interrupt an expansion gesture here, make sure to update the state correctly.
	if (mIsExpanding) {		notifyExpandingFinished();
	onExpandingFinished();
	}
	}		}
	}		}

	@@ -970,7 +969,6 @@ public class NotificationPanelView extends PanelView implements
	private void onQsExpansionStarted(int overscrollAmount) {		private void onQsExpansionStarted(int overscrollAmount) {
	cancelQsAnimation();		cancelQsAnimation();
	cancelHeightAnimator();		cancelHeightAnimator();
	notifyExpandingFinished();

	// Reset scroll position and apply that position to the expanded height.		// Reset scroll position and apply that position to the expanded height.
	float height = mQsExpansionHeight - mScrollView.getScrollY() - overscrollAmount;		float height = mQsExpansionHeight - mScrollView.getScrollY() - overscrollAmount;