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

am 147a6767: am 9763de61: Merge "Old habits die hard." into lmp-dev

Browse Source 
* commit '147a67677163a24bf1df6e207f466bcaab960081':
  Old habits die hard.
This commit is contained in:
Dan Sandler
2014-07-22 02:55:20 +00:00
committed by Android Git Automerger
parent 3683347370 0b61c9ee1e
commit a650c4075c
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -71,7 +71,6 @@ import android.os.RemoteException;
import android.os.SystemClock;
import android.os.UserHandle;
import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
import android.service.notification.NotificationListenerService.RankingMap;
import android.service.notification.StatusBarNotification;
import android.util.ArraySet;
@@ -1598,24 +1597,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
updateMediaMetaData(metaDataChanged);
}
private void removeAndRecycleImageViewDrawable(ImageView iv) {
Bitmap oldBitmap = null;
final Drawable drawable = iv.getDrawable();
if (drawable != null && drawable instanceof BitmapDrawable) {
oldBitmap = ((BitmapDrawable) drawable).getBitmap();
}
iv.animate().cancel();
iv.setImageDrawable(null);
if (oldBitmap != null) {
if (DEBUG_MEDIA) {
Log.v(TAG, "DEBUG_MEDIA: recycling bitmap " + oldBitmap + " from ImageView " + iv);
}
oldBitmap.recycle();
}
}
/**
* Hide the album artwork that is fading out and release its memory.
* Hide the album artwork that is fading out and release its bitmap.
*/
private Runnable mHideBackdropFront = new Runnable() {
@Override
@@ -1624,7 +1607,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
Log.v(TAG, "DEBUG_MEDIA: removing fade layer");
}
mBackdropFront.setVisibility(View.INVISIBLE);
removeAndRecycleImageViewDrawable(mBackdropFront);
mBackdropFront.animate().cancel();
mBackdropFront.setImageDrawable(null);
}
};