From a6e15ec2ca6b134c412d50c2a2032e7f547b20e3 Mon Sep 17 00:00:00 2001
From: Evan Charlton <evanc@google.com>
Date: Wed, 17 Dec 2014 10:32:16 -0800
Subject: Always animate drawables when given animations

When given an animated drawable, always animate it, rather than only
when the call isn't connected.

Bug: 18695179
Change-Id: Ia9b320e2f5f47ee7fdfb489b91c736912dcdfd16
---
 InCallUI/src/com/android/incallui/CallCardFragment.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index 6685c06ff..c70bd6ed6 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -530,12 +530,11 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
                     || TextUtils.isEmpty(callStateLabel)) {
                 mCallStateIcon.clearAnimation();
             } else {
-                if (callStateIcon instanceof AnimationDrawable) {
-                    // Animate the drawable instead of the view
-                    ((AnimationDrawable) callStateIcon).start();
-                } else {
-                    mCallStateIcon.startAnimation(mPulseAnimation);
-                }
+                mCallStateIcon.startAnimation(mPulseAnimation);
+            }
+
+            if (callStateIcon instanceof AnimationDrawable) {
+                ((AnimationDrawable) callStateIcon).start();
             }
         } else {
             Animation callStateIconAnimation = mCallStateIcon.getAnimation();
-- 
cgit v1.2.3