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

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

Merge "Fixes volume dialog in dark mode."

parents 7ba47318 503639db

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

+6 −11
Original line number Diff line number Diff line
@@ -135,10 +135,6 @@ public class VolumeDialogImpl implements VolumeDialog { 
    private final AccessibilityManagerWrapper mAccessibilityMgr;

    private final Object mSafetyWarningLock = new Object();

    private final Accessibility mAccessibility = new Accessibility();

    private ColorStateList mActiveTint;

    private int mActiveAlpha;

    private ColorStateList mInactiveTint;

    private int mInactiveAlpha;



    private boolean mShowing;

    private boolean mShowA11yStream;
@@ -238,11 +234,6 @@ public class VolumeDialogImpl implements VolumeDialog { 
        lp.gravity = ((FrameLayout.LayoutParams) mDialogView.getLayoutParams()).gravity;

        mWindow.setAttributes(lp);



        mActiveTint = Utils.getColorAccent(mContext);

        mActiveAlpha = Color.alpha(mActiveTint.getDefaultColor());

        mInactiveTint = Utils.getColorAttr(mContext, android.R.attr.colorForeground);

        mInactiveAlpha = getAlphaAttr(android.R.attr.secondaryContentAlpha);



        mDialogRowsView = mDialog.findViewById(R.id.volume_dialog_rows);

        mRinger = mDialog.findViewById(R.id.ringer);

        if (mRinger != null) {
@@ -942,8 +933,12 @@ public class VolumeDialogImpl implements VolumeDialog { 
            row.slider.requestFocus();

        }

        boolean useActiveColoring = isActive && row.slider.isEnabled();

        final ColorStateList tint = useActiveColoring ? mActiveTint : mInactiveTint;

        final int alpha = useActiveColoring ? mActiveAlpha : mInactiveAlpha;

        final ColorStateList tint = useActiveColoring

                ? Utils.getColorAccent(mContext)

                : Utils.getColorAttr(mContext, android.R.attr.colorForeground);

        final int alpha = useActiveColoring

                ? Color.alpha(tint.getDefaultColor())

                : getAlphaAttr(android.R.attr.secondaryContentAlpha);

        if (tint == row.cachedTint) return;

        row.slider.setProgressTintList(tint);

        row.slider.setThumbTintList(tint);