diff options
3 files changed, 7 insertions, 2 deletions
diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java index 31c5f8d061c7..d2d66b662ba6 100644 --- a/core/java/android/animation/ObjectAnimator.java +++ b/core/java/android/animation/ObjectAnimator.java @@ -351,7 +351,7 @@ public final class ObjectAnimator extends ValueAnimator { @Override public void start() { if (DBG) { - Log.d("ObjectAnimator", "Anim target, duration" + mTarget + ", " + getDuration()); + Log.d("ObjectAnimator", "Anim target, duration: " + mTarget + ", " + getDuration()); for (int i = 0; i < mValues.length; ++i) { PropertyValuesHolder pvh = mValues[i]; ArrayList<Keyframe> keyframes = pvh.mKeyframeSet.mKeyframes; diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 7db1b321bc71..7ca8174df956 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1599,6 +1599,11 @@ public final class ViewRootImpl extends Handler implements ViewParent, } } } else { + // If we're not drawing, then we don't need to draw the transitions, either + if (mPendingTransitions != null) { + mPendingTransitions.clear(); + } + // We were supposed to report when we are done drawing. Since we canceled the // draw, remember it here. if ((relayoutResult&WindowManagerImpl.RELAYOUT_FIRST_TIME) != 0) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java index 4a1cafdcce6e..510fd3bcb7b0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java @@ -147,7 +147,7 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, public boolean onPreDraw() { getViewTreeObserver().removeOnPreDrawListener(this); mChoreo.startAnimation(true); - return true; + return false; } }; |