Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7c49aa1 authored by Dan Sandler's avatar Dan Sandler Committed by Android (Google) Code Review
Browse files

Merge "Old habits die hard." into lmp-dev

parents bfe76f45 7dea0eeb

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

+3 −19
Original line number Original line Diff line number Diff line
@@ -71,7 +71,6 @@ import android.os.RemoteException; 
import android.os.SystemClock;

import android.os.SystemClock;

import android.os.UserHandle;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.service.notification.NotificationListenerService.RankingMap;

import android.service.notification.NotificationListenerService.RankingMap;

import android.service.notification.StatusBarNotification;

import android.service.notification.StatusBarNotification;

import android.util.ArraySet;

import android.util.ArraySet;
@@ -1598,24 +1597,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        updateMediaMetaData(metaDataChanged);

        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() {

    private Runnable mHideBackdropFront = new Runnable() {

        @Override

        @Override
@@ -1624,7 +1607,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                Log.v(TAG, "DEBUG_MEDIA: removing fade layer");

                Log.v(TAG, "DEBUG_MEDIA: removing fade layer");

            }

            }

            mBackdropFront.setVisibility(View.INVISIBLE);

            mBackdropFront.setVisibility(View.INVISIBLE);

            removeAndRecycleImageViewDrawable(mBackdropFront);

            mBackdropFront.animate().cancel();

            mBackdropFront.setImageDrawable(null);

        }

        }

    };

    };