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

Commit a31ac7dd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 62716a91 f4d803d4

packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -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();