summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-12-17 10:32:16 -0800
committerEvan Charlton <evanc@google.com>2014-12-17 10:50:06 -0800
commit85e0b443d11f1a6bbac0110d4b139bc62e5a01c0 (patch)
treef1ff009b139020f1400cb227bb1aa5f64be18a99
parentc10b11df44e918fb26329159175dfe6fb6642437 (diff)
downloadpackages_apps_InCallUI-85e0b443d11f1a6bbac0110d4b139bc62e5a01c0.tar.gz
packages_apps_InCallUI-85e0b443d11f1a6bbac0110d4b139bc62e5a01c0.tar.bz2
packages_apps_InCallUI-85e0b443d11f1a6bbac0110d4b139bc62e5a01c0.zip
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
-rw-r--r--src/com/android/incallui/CallCardFragment.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index 6685c06f..c70bd6ed 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/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();