Skip to content

Commit a801f68

Browse files
committed
Restore rubberbanding on initial pulldown.
Broken by change Id93d6a00. Bug: 7286201 Change-Id: I4155076df09d548aa00ae3793f78e6c154cde5f1
1 parent efd7b26 commit a801f68

File tree

1 file changed

+3
-3
lines changed
  • packages/SystemUI/src/com/android/systemui/statusbar/phone

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ private void animationTick(long dtms) {
105105
mTimeAnimator = new TimeAnimator();
106106
mTimeAnimator.setTimeListener(mAnimationCallback);
107107

108-
mPeekAnimator.cancel();
108+
if (mPeekAnimator != null) mPeekAnimator.cancel();
109109

110110
mTimeAnimator.start();
111111

@@ -261,7 +261,7 @@ public boolean onTouch(View v, MotionEvent event) {
261261
case MotionEvent.ACTION_MOVE:
262262
final float h = rawY - mAbsPos[1] - mTouchOffset;
263263
if (h > mPeekHeight) {
264-
if (mPeekAnimator.isRunning()) {
264+
if (mPeekAnimator != null && mPeekAnimator.isRunning()) {
265265
mPeekAnimator.cancel();
266266
}
267267
mJustPeeked = false;
@@ -385,7 +385,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
385385

386386
public void setExpandedHeight(float height) {
387387
if (DEBUG) LOG("setExpandedHeight(%.1f)", height);
388-
mTracking = mRubberbanding = false;
388+
mRubberbanding = false;
389389
if (mTimeAnimator.isRunning()) {
390390
post(mStopAnimator);
391391
}

0 commit comments

Comments
 (0)