summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-08-31 17:23:11 -0700
committerYorke Lee <yorkelee@google.com>2015-09-01 13:27:56 -0700
commit46e581fa8b4ae7a9c58441d39c080252a1eb60af (patch)
tree6c83c0b4f1ee2c8bbe0019e9ccb58b99262c370c
parentf053e4b3f423caa5b3215792f5c021168c7bacb0 (diff)
downloadInCallUI-46e581fa8b4ae7a9c58441d39c080252a1eb60af.tar.gz
Make sure to clear PulseAnimation correctly in InCallActivity
An orphaned animation causes unnecessary frames updates in RenderThread. Bug: 22934313 Change-Id: I3b3fb433eb830c3bc05430eb1da4d72c178ddd62
-rw-r--r--src/com/android/incallui/CallCardFragment.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index dc92ac3e..fb0ef75a 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/src/com/android/incallui/CallCardFragment.java
@@ -586,6 +586,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
} else {
mCallStateLabel.startAnimation(mPulseAnimation);
}
+ } else {
+ mCallStateLabel.clearAnimation();
}
if (callStateIcon != null) {
@@ -606,10 +608,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.