commit 62d13e685d6858fd0f9ced78389f49a483d643e8
author Yorke Lee <yorkelee@google.com> Thu Sep 03 04:22:13 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 04:22:13 2015 +0000
tree 726d8cdc4d730f8dc4ecafebcc625059c7f822f6
parent 2b0ba99f37e2f052c589cd1f1065cc0f844d5646
parent 5e7f57550a998946be588f17190484f51ffae704

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

* commit '596817c2b232a97e17e674013e6200fb8799393b':
  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 dc92ac3..fb0ef75 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -586,6 +586,8 @@
             } else {
                 mCallStateLabel.startAnimation(mPulseAnimation);
             }
+        } else {
+            mCallStateLabel.clearAnimation();
         }
 
         if (callStateIcon != null) {
@@ -606,10 +608,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.