summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-12-17 19:54:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-17 19:54:21 +0000
commitdfb48632da299599ec6f1493ae3e5604ac7fcb0b (patch)
tree69b913166b40633116a4e7078130cac73a1d2f10 /InCallUI
parentfe7b9bc8b9f7c92337249da518ee0a653b61851a (diff)
parent138e445fbdba1a1949f17e7befbbaf758721fe25 (diff)
am f09fd06d: am 60e61f90: am 85e0b443: Always animate drawables when given animations
* commit 'f09fd06d92d3fb622f04f7b757096d3082577bc1': Always animate drawables when given animations
Diffstat (limited to 'InCallUI')
-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();