commit d9b158b71547178343bc7b8efb887b11c0db1789
author Yorke Lee <yorkelee@google.com> Tue Sep 01 22:29:09 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 01 22:29:09 2015 +0000
tree 395c402a700d0a0e78520d92260709cc12c89a0a
parent c9b7283493f433968ba4cb68c99b0922dd8b9e9d
parent a8644bb995c4e0fabc07ffb8b2bf80a0dd448250

Merge "DO NOT MERGE Make sure to clear PulseAnimation correctly in InCallActivity" into ub-contactsdialer-a-dev

InCallUI/src/com/android/incallui/CallCardFragment.java

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 99adccc..5e00587 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -622,6 +622,8 @@
             } else {
                 mCallStateLabel.startAnimation(mPulseAnimation);
             }
+        } else {
+            mCallStateLabel.clearAnimation();
         }
 
         if (callStateIcon != null) {
@@ -642,10 +644,7 @@
                 ((AnimationDrawable) callStateIcon).start();
             }
         } else {
-            Animation callStateIconAnimation = mCallStateIcon.getAnimation();
-            if (callStateIconAnimation != null) {
-                callStateIconAnimation.cancel();
-            }
+            mCallStateIcon.clearAnimation();
 
             // Invoke setAlpha(float) instead of setAlpha(int) to set the view's alpha. This is
             // needed because the pulse animation operates on the view alpha.