Merge "Fix signal cluster animation leak" into nyc-dev

This commit is contained in:
Jorim Jaggi
2016-04-22 04:09:11 +00:00
committed by Android (Google) Code Review

View File

@@ -295,6 +295,14 @@ public class SignalClusterView
return; return;
} }
// Clear out all old subIds. // Clear out all old subIds.
for (PhoneState state : mPhoneStates) {
if (state.mMobile != null) {
state.maybeStopAnimatableDrawable(state.mMobile);
}
if (state.mMobileDark != null) {
state.maybeStopAnimatableDrawable(state.mMobileDark);
}
}
mPhoneStates.clear(); mPhoneStates.clear();
if (mMobileSignalGroup != null) { if (mMobileSignalGroup != null) {
mMobileSignalGroup.removeAllViews(); mMobileSignalGroup.removeAllViews();
@@ -391,6 +399,11 @@ public class SignalClusterView
state.mMobile.setImageDrawable(null); state.mMobile.setImageDrawable(null);
state.mLastMobileStrengthId = -1; state.mLastMobileStrengthId = -1;
} }
if (state.mMobileDark != null) {
state.maybeStopAnimatableDrawable(state.mMobileDark);
state.mMobileDark.setImageDrawable(null);
state.mLastMobileStrengthId = -1;
}
if (state.mMobileType != null) { if (state.mMobileType != null) {
state.mMobileType.setImageDrawable(null); state.mMobileType.setImageDrawable(null);
state.mLastMobileTypeId = -1; state.mLastMobileTypeId = -1;