diff options
| -rwxr-xr-x | packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java index 81a16ae42e4a..0f894a154f39 100755 --- a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java @@ -101,8 +101,7 @@ public class GestureRecorder { mDownTime = ev.getDownTime(); } else { if (mDownTime != ev.getDownTime()) { - // TODO: remove - throw new RuntimeException("Assertion failure in GestureRecorder: event downTime (" + Slog.w(TAG, "Assertion failure in GestureRecorder: event downTime (" +ev.getDownTime()+") does not match gesture downTime ("+mDownTime+")"); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index d0fba4256ba7..336eee4a9cf5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -59,6 +59,11 @@ public class PanelView extends FrameLayout { } }; + private final Runnable mStopAnimator = new Runnable() { public void run() { + if (mTimeAnimator.isStarted()) { + mTimeAnimator.end(); } + }}; + private float mVel, mAccel; private int mFullHeight = 0; private String mViewName; @@ -117,7 +122,7 @@ public class PanelView extends FrameLayout { if (mVel == 0 || (closing && mExpandedHeight == 0) || (!closing && mExpandedHeight == getFullHeight())) { - mTimeAnimator.end(); + post(mStopAnimator); } } } @@ -277,7 +282,7 @@ public class PanelView extends FrameLayout { public void setExpandedHeight(float height) { - mTimeAnimator.end(); + post(mStopAnimator); setExpandedHeightInternal(height); } |