Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 8891ae1f7f

* commit '8891ae1f7f69a1d1b203477bea01674c98af1141':
  Fix signal cluster animation leak

Change-Id: I00e58b5fc254f68c1f2a0549ececd01a31278cfb
This commit is contained in:
Jorim Jaggi
2016-04-22 04:14:16 +00:00
committed by android-build-merger
parent 6b755582bd 8891ae1f7f
commit f934025e9d
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
View File

@@ -299,6 +299,14 @@ public class SignalClusterView
return;
}
// 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();
if (mMobileSignalGroup != null) {
mMobileSignalGroup.removeAllViews();
@@ -395,6 +403,11 @@ public class SignalClusterView
state.mMobile.setImageDrawable(null);
state.mLastMobileStrengthId = -1;
}
if (state.mMobileDark != null) {
state.maybeStopAnimatableDrawable(state.mMobileDark);
state.mMobileDark.setImageDrawable(null);
state.mLastMobileStrengthId = -1;
}
if (state.mMobileType != null) {
state.mMobileType.setImageDrawable(null);
state.mLastMobileTypeId = -1;