Merge changes Ifad4bd65,I6a4b7d69 into jb-mr1-dev
* changes:
Turn off an assert.
Fix crash in SystemUI.
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java
index 81a16ae..0f894a1 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 @@
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 d0fba42..336eee4 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 @@
}
};
+ 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 @@
if (mVel == 0
|| (closing && mExpandedHeight == 0)
|| (!closing && mExpandedHeight == getFullHeight())) {
- mTimeAnimator.end();
+ post(mStopAnimator);
}
}
}
@@ -277,7 +282,7 @@
public void setExpandedHeight(float height) {
- mTimeAnimator.end();
+ post(mStopAnimator);
setExpandedHeightInternal(height);
}