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

Merge "Fix leak on density change." into nyc-dev

Browse Source 
am: a31ac7ddfb

* commit 'a31ac7ddfbccdb602aebb05686fcdb582ba74752':
  Fix leak on density change.

Change-Id: I4158711144354eb7059d6b421ed35d6673b63a5b
This commit is contained in:
Julia Reynolds
2016-06-02 19:30:58 +00:00
committed by android-build-merger
parent 48347048ba a31ac7ddfb
commit db3744969e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
View File

@@ -106,14 +106,14 @@ public class VolumeDialog implements TunerService.Tunable {
private ViewGroup mDialogContentView; private ViewGroup mDialogContentView;
private ImageButton mExpandButton; private ImageButton mExpandButton;
private final List<VolumeRow> mRows = new ArrayList<>(); private final List<VolumeRow> mRows = new ArrayList<>();
private final SpTexts mSpTexts; private SpTexts mSpTexts;
private final SparseBooleanArray mDynamic = new SparseBooleanArray(); private final SparseBooleanArray mDynamic = new SparseBooleanArray();
private final KeyguardManager mKeyguard; private final KeyguardManager mKeyguard;
private final AudioManager mAudioManager; private final AudioManager mAudioManager;
private final AccessibilityManager mAccessibilityMgr; private final AccessibilityManager mAccessibilityMgr;
private int mExpandButtonAnimationDuration; private int mExpandButtonAnimationDuration;
private ZenFooter mZenFooter; private ZenFooter mZenFooter;
private final LayoutTransition mLayoutTransition; private LayoutTransition mLayoutTransition;
private final Object mSafetyWarningLock = new Object(); private final Object mSafetyWarningLock = new Object();
private final Accessibility mAccessibility = new Accessibility(); private final Accessibility mAccessibility = new Accessibility();
private final ColorStateList mActiveSliderTint; private final ColorStateList mActiveSliderTint;
@@ -149,14 +149,11 @@ public class VolumeDialog implements TunerService.Tunable {
mCallback = callback; mCallback = callback;
mWindowType = windowType; mWindowType = windowType;
mZenModeController = zenModeController; mZenModeController = zenModeController;
mSpTexts = new SpTexts(mContext);
mKeyguard = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); mKeyguard = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
mAccessibilityMgr = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE); mAccessibilityMgr = (AccessibilityManager) mContext.getSystemService(Context.ACCESSIBILITY_SERVICE);
mActiveSliderTint = loadColorStateList(R.color.system_accent_color); mActiveSliderTint = loadColorStateList(R.color.system_accent_color);
mInactiveSliderTint = loadColorStateList(R.color.volume_slider_inactive); mInactiveSliderTint = loadColorStateList(R.color.volume_slider_inactive);
mLayoutTransition = new LayoutTransition();
mLayoutTransition.setDuration(new ValueAnimator().getDuration() / 2);
initDialog(); initDialog();
@@ -173,6 +170,9 @@ public class VolumeDialog implements TunerService.Tunable {
private void initDialog() { private void initDialog() {
mDialog = new CustomDialog(mContext); mDialog = new CustomDialog(mContext);
mSpTexts = new SpTexts(mContext);
mLayoutTransition = new LayoutTransition();
mLayoutTransition.setDuration(new ValueAnimator().getDuration() / 2);
mHovering = false; mHovering = false;
mShowing = false; mShowing = false;
final Window window = mDialog.getWindow(); final Window window = mDialog.getWindow();