commit 94da3dc172a3cf63fd73378ee0c7d109d13aa143
author Yorke Lee <yorkelee@google.com> Thu Sep 03 04:34:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 04:34:43 2015 +0000
tree 395c402a700d0a0e78520d92260709cc12c89a0a
parent 8f5cebe0d997d3d11a869bc34c2ffbac3f21a1ff
parent 62d13e685d6858fd0f9ced78389f49a483d643e8

am edb5e0dd: am 596817c2: am bdb86ffb: am 46e581fa: Make sure to clear PulseAnimation correctly in InCallActivity

* commit 'edb5e0dda4690398af02ba1d677b6bf157f33f7b':
  Make sure to clear PulseAnimation correctly in InCallActivity

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.