Merge "Fix flashy transition in QuickContacts" into jb-dev

Author: Craig Mautner

services/java/com/android/server/wm/AppWindowAnimator.java

@@ -85,6 +85,9 @@ public void setDummyAnimation() {
             animation = sDummyAnimation;
             animInitialized = false;
         }
+        hasTransformation = true;
+        transformation.clear();
+        transformation.setAlpha(mAppToken.reportedVisible ? 1 : 0);
     }
 
     public void clearAnimation() {
@@ -186,8 +189,6 @@ boolean stepAnimationLocked(long currentTime, int dw, int dh) {
                 // it as not animating for purposes of scheduling transactions;
                 // when it is really time to animate, this will be set to
                 // a real animation and the next call will execute normally.
-                hasTransformation = true;
-                transformation.setAlpha(mAppToken.reportedVisible ? 1 : 0);
                 return false;
             }