am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS

* commit '9c95638495ce1f3600b6c8a3169433b99d7f2575':
  Make sure expandingFinished gets called when going into QS
This commit is contained in:
Jorim Jaggi
2015-07-24 03:08:48 +00:00
committed by Android Git Automerger
2 changed files with 3 additions and 2 deletions

View File

@@ -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;

View File

@@ -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();