commit eb3788907132eec5724bbb78f20711c4ffe35b1b
author Romain Guy <romainguy@google.com> Thu Apr 12 11:33:14 2012 -0700
committer Romain Guy <romainguy@google.com> Thu Apr 12 11:33:14 2012 -0700
tree c9818aa26b641251319a09e3081a4a0b9a871080
parent 1ac4765e959c79101f64b1279887ed469334c268

Don't wait for screen on to finish animations

OldAnimations™ would set their start time during the first frame drawn
after calling View.startAnimation(). If this method was invoked while
the screen was off, this would cause the animation to start playing
when the screen turned back on.

Change-Id: Ic45a1af2020a7f5e81c2544bd8f16a6bedbd6849

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index d62e32f..d34ef3a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -9769,7 +9769,7 @@
      * @attr ref android.R.styleable#View_scrollbarSize
      */
     public int getScrollBarSize() {
-        return mScrollCache == null ? ViewConfiguration.getScrollBarSize() :
+        return mScrollCache == null ? ViewConfiguration.get(mContext).getScaledScrollBarSize() :
                 mScrollCache.scrollBarSize;
     }
 
@@ -12948,6 +12948,7 @@
      *        background
      */
     public void setBackground(Drawable background) {
+        //noinspection deprecation
         setBackgroundDrawable(background);
     }
 
@@ -14273,7 +14274,15 @@
      */
     public void setAnimation(Animation animation) {
         mCurrentAnimation = animation;
+
         if (animation != null) {
+            // If the screen is off assume the animation start time is now instead of
+            // the next frame we draw. Keeping the START_ON_FIRST_FRAME start time
+            // would cause the animation to start when the screen turns back on
+            if (mAttachInfo != null && !mAttachInfo.mScreenOn &&
+                    animation.getStartTime() == Animation.START_ON_FIRST_FRAME) {
+                animation.setStartTime(AnimationUtils.currentAnimationTimeMillis());
+            }
             animation.reset();
         }
     }