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

Commit 924102ab authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Volume iconography update" into pi-dev 

am: 4a498757

Change-Id: I1b73b0e70a0f04d99a3049b348656d70fbb6e872
parents e467e30c 4a498757

packages/SystemUI/res/drawable/ic_volume_accessibility.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -15,8 +15,8 @@ 
  -->

  -->





<vector xmlns:android="http://schemas.android.com/apk/res/android"

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="32dp"

        android:width="24dp"

        android:height="32dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

        android:tint="?android:attr/colorControlNormal">

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

+13 −14
Original line number Original line Diff line number Diff line
@@ -45,10 +45,8 @@ import android.content.res.Resources; 
import android.graphics.Color;

import android.graphics.Color;

import android.graphics.PixelFormat;

import android.graphics.PixelFormat;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.ColorDrawable;

import android.media.AudioAttributes;

import android.media.AudioManager;

import android.media.AudioManager;

import android.media.AudioSystem;

import android.media.AudioSystem;

import android.media.MediaPlayer;

import android.os.Debug;

import android.os.Debug;

import android.os.Handler;

import android.os.Handler;

import android.os.Looper;

import android.os.Looper;
@@ -132,8 +130,8 @@ public class VolumeDialogImpl implements VolumeDialog { 
    private final AccessibilityManagerWrapper mAccessibilityMgr;

    private final AccessibilityManagerWrapper mAccessibilityMgr;

    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 mActiveTint;

    private final ColorStateList mInactiveSliderTint;

    private final ColorStateList mInactiveTint;

    private final Vibrator mVibrator;

    private final Vibrator mVibrator;





    private boolean mShowing;

    private boolean mShowing;
@@ -152,8 +150,8 @@ public class VolumeDialogImpl implements VolumeDialog { 
        mController = Dependency.get(VolumeDialogController.class);

        mController = Dependency.get(VolumeDialogController.class);

        mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);

        mKeyguard = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE);

        mAccessibilityMgr = Dependency.get(AccessibilityManagerWrapper.class);

        mAccessibilityMgr = Dependency.get(AccessibilityManagerWrapper.class);

        mActiveSliderTint = ColorStateList.valueOf(Utils.getColorAccent(mContext));

        mActiveTint = ColorStateList.valueOf(Utils.getColorAccent(mContext));

        mInactiveSliderTint = loadColorStateList(R.color.volume_slider_inactive);

        mInactiveTint = loadColorStateList(R.color.volume_slider_inactive);

        mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);

        mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);

        mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);

        mVibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);

    }

    }
@@ -614,7 +612,7 @@ public class VolumeDialogImpl implements VolumeDialog { 
            final boolean shouldBeVisible = shouldBeVisibleH(row, activeRow);

            final boolean shouldBeVisible = shouldBeVisibleH(row, activeRow);

            Util.setVisOrGone(row.view, shouldBeVisible);

            Util.setVisOrGone(row.view, shouldBeVisible);

            if (row.view.isShown()) {

            if (row.view.isShown()) {

                updateVolumeRowSliderTintH(row, isActive);

                updateVolumeRowTintH(row, isActive);

            }

            }

        }

        }

    }

    }
@@ -848,21 +846,22 @@ public class VolumeDialogImpl implements VolumeDialog { 
        updateVolumeRowSliderH(row, enableSlider, vlevel);

        updateVolumeRowSliderH(row, enableSlider, vlevel);

    }

    }





    private void updateVolumeRowSliderTintH(VolumeRow row, boolean isActive) {

    private void updateVolumeRowTintH(VolumeRow row, boolean isActive) {

        if (isActive) {

        if (isActive) {

            row.slider.requestFocus();

            row.slider.requestFocus();

        }

        }

        final ColorStateList tint = isActive && row.slider.isEnabled() ? mActiveSliderTint

        final ColorStateList tint = isActive && row.slider.isEnabled() ? mActiveTint

                : mInactiveSliderTint;

                : mInactiveTint;

        if (tint == row.cachedSliderTint) return;

        if (tint == row.cachedTint) return;

        row.cachedSliderTint = tint;

        row.slider.setProgressTintList(tint);

        row.slider.setProgressTintList(tint);

        row.slider.setThumbTintList(tint);

        row.slider.setThumbTintList(tint);

        row.icon.setImageTintList(tint);

        row.cachedTint = tint;

    }

    }





    private void updateVolumeRowSliderH(VolumeRow row, boolean enable, int vlevel) {

    private void updateVolumeRowSliderH(VolumeRow row, boolean enable, int vlevel) {

        row.slider.setEnabled(enable);

        row.slider.setEnabled(enable);

        updateVolumeRowSliderTintH(row, row.stream == mActiveStream);

        updateVolumeRowTintH(row, row.stream == mActiveStream);

        if (row.tracking) {

        if (row.tracking) {

            return;  // don't update if user is sliding

            return;  // don't update if user is sliding

        }

        }
@@ -1234,7 +1233,7 @@ public class VolumeDialogImpl implements VolumeDialog { 
        private int iconMuteRes;

        private int iconMuteRes;

        private boolean important;

        private boolean important;

        private boolean defaultStream;

        private boolean defaultStream;

        private ColorStateList cachedSliderTint;

        private ColorStateList cachedTint;

        private int iconState;  // from Events

        private int iconState;  // from Events

        private ObjectAnimator anim;  // slider progress animation for non-touch-related updates

        private ObjectAnimator anim;  // slider progress animation for non-touch-related updates

        private int animTargetProgress;

        private int animTargetProgress;