diff options
author | Yorke Lee <yorkelee@google.com> | 2015-08-31 17:23:11 -0700 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2015-09-01 15:28:33 -0700 |
commit | a8644bb995c4e0fabc07ffb8b2bf80a0dd448250 (patch) | |
tree | 85def485337b26836cda11ccde37449b3b63ac76 /InCallUI | |
parent | 78d91bc3e43222f95fcd34f08c1349675c8f1e4a (diff) |
DO NOT MERGE Make sure to clear PulseAnimation correctly in InCallActivity
An orphaned animation causes unnecessary frames updates in
RenderThread.
Bug: 22934313
Change-Id: I3b3fb433eb830c3bc05430eb1da4d72c178ddd62
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 99adcccbd..5e00587b4 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -622,6 +622,8 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } else { mCallStateLabel.startAnimation(mPulseAnimation); } + } else { + mCallStateLabel.clearAnimation(); } if (callStateIcon != null) { @@ -642,10 +644,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. |