From a8644bb995c4e0fabc07ffb8b2bf80a0dd448250 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Mon, 31 Aug 2015 17:23:11 -0700
Subject: DO NOT MERGE Make sure to clear PulseAnimation correctly in
 InCallActivity

An orphaned animation causes unnecessary frames updates in
RenderThread.

Bug: 22934313
Change-Id: I3b3fb433eb830c3bc05430eb1da4d72c178ddd62
---
 InCallUI/src/com/android/incallui/CallCardFragment.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'InCallUI')

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 99adcccbd..5e00587b4 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -622,6 +622,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             } else {
                 mCallStateLabel.startAnimation(mPulseAnimation);
             }
+        } else {
+            mCallStateLabel.clearAnimation();
         }
 
         if (callStateIcon != null) {
@@ -642,10 +644,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
                 ((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.
-- 
cgit v1.2.3