summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-12-17 19:39:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-17 19:39:35 +0000
commitcd6671375a2d1197a4ff62966d3d287ce0f9fee3 (patch)
tree5b3b0b29fb26501306a943a72d4bdf814c16a09d
parentbe7beea88b3190dbde16b0c538565241f1864567 (diff)
parenta6e15ec2ca6b134c412d50c2a2032e7f547b20e3 (diff)
am 85e0b443: Always animate drawables when given animations
* commit '85e0b443d11f1a6bbac0110d4b139bc62e5a01c0': Always animate drawables when given animations
-rw-r--r--InCallUI/src/com/android/incallui/CallCardFragment.java11
1 files 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();