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

Merge "Volume: Separate tint colors for active vs inactive sliders." into mnc-dev

Browse Source
This commit is contained in:
John Spurlock
2015-05-11 16:15:21 +00:00
committed by Android (Google) Code Review
parent 7846d966f5 77bb25af3d
commit 13ea79dea4
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/volume_dialog_row.xml
View File

@@ -50,9 +50,7 @@
android:layout_toEndOf="@id/volume_row_icon"
android:layout_toStartOf="@+id/volume_settings_button"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:progressTint="@android:color/white"
android:thumbTint="@android:color/white" />
android:paddingStart="8dp" />
<com.android.keyguard.AlphaOptimizedImageButton
android:id="@+id/volume_settings_button"

1
packages/SystemUI/res/values/colors.xml
View File

@@ -142,4 +142,5 @@
<color name="zen_introduction_message_background">#ff009688</color><!-- deep teal 500 -->
<color name="volume_icon_color">#ffffffff</color>
<color name="volume_settings_icon_color">#7fffffff</color>
<color name="volume_slider_inactive">#FFB0BEC5</color><!-- blue grey 200 -->
</resources>

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

@@ -26,6 +26,7 @@ import android.annotation.SuppressLint;
import android.app.Dialog;
import android.app.KeyguardManager;
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.PixelFormat;
@@ -107,6 +108,8 @@ public class VolumeDialog {
private final LayoutTransition mLayoutTransition;
private final Object mSafetyWarningLock = new Object();
private final Accessibility mAccessibility = new Accessibility();
private final ColorStateList mActiveSliderTint;
private final ColorStateList mInactiveSliderTint;
private boolean mShowing;
private boolean mExpanded;
@@ -152,6 +155,8 @@ public class VolumeDialog {
lp.gravity = Gravity.TOP;
window.setAttributes(lp);
mActiveSliderTint = loadColorStateList(R.color.system_accent_color);
mInactiveSliderTint = loadColorStateList(R.color.volume_slider_inactive);
mDialog.setContentView(R.layout.volume_dialog);
mDialogView = (ViewGroup) mDialog.findViewById(R.id.volume_dialog);
mDialogContentView = (ViewGroup) mDialog.findViewById(R.id.volume_dialog_content);
@@ -190,6 +195,10 @@ public class VolumeDialog {
controller.getState();
}
private ColorStateList loadColorStateList(int colorResId) {
return ColorStateList.valueOf(mContext.getColor(colorResId));
}
private void updateWindowWidthH() {
final ViewGroup.LayoutParams lp = mDialogView.getLayoutParams();
final DisplayMetrics dm = mContext.getResources().getDisplayMetrics();
@@ -524,6 +533,8 @@ public class VolumeDialog {
}
Util.setVisOrInvis(row.settingsButton, false);
row.header.setAlpha(mExpanded && isActive ? 1 : 0.5f);
row.slider.setProgressTintList(isActive ? mActiveSliderTint : mInactiveSliderTint);
row.slider.setThumbTintList(isActive ? mActiveSliderTint : mInactiveSliderTint);
}
}