diff --git a/packages/SettingsLib/res/drawable/notification_auto_importance.xml b/packages/SettingsLib/res/drawable/notification_auto_importance.xml index a63e911b9ffc7cf0cf91eccbab7a8c1c6346b4f2..c94615312306f3ddc0b5b4447ecb1a97ddd5b703 100644 --- a/packages/SettingsLib/res/drawable/notification_auto_importance.xml +++ b/packages/SettingsLib/res/drawable/notification_auto_importance.xml @@ -20,8 +20,8 @@ android:viewportHeight="24.0"> + android:pathData="M10.8,12.7l2.4,0l-1.2,-3.7z"/> + android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM14.3,16l-0.7,-2h-3.2l-0.7,2H7.8L11,7h2l3.2,9H14.3z"/> \ No newline at end of file diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java index 4650a1f090edc11fbb8c99d7ecf02050bdf14719..b523a112c209b461ce48fae91882fd2879f025f8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.ColorStateList; +import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.os.Handler; @@ -70,6 +71,8 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab private ImageView mAutoButton; private ColorStateList mActiveSliderTint; private ColorStateList mInactiveSliderTint; + private float mActiveSliderAlpha = 1.0f; + private float mInactiveSliderAlpha; private TextView mImportanceSummary; private TextView mImportanceTitle; private boolean mAuto; @@ -100,6 +103,11 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab } } }; + final TypedArray ta = + context.obtainStyledAttributes(attrs, com.android.internal.R.styleable.Theme, 0, 0); + mInactiveSliderAlpha = + ta.getFloat(com.android.internal.R.styleable.Theme_disabledAlpha, 0.5f); + ta.recycle(); } public void resetFalsingCheck() { @@ -299,13 +307,12 @@ public class NotificationGuts extends LinearLayout implements TunerService.Tunab private void applyAuto() { mSeekBar.setEnabled(!mAuto); - final ColorStateList sliderTint = mAuto ? mInactiveSliderTint : mActiveSliderTint; final ColorStateList starTint = mAuto ? mActiveSliderTint : mInactiveSliderTint; + final float alpha = mAuto ? mInactiveSliderAlpha : mActiveSliderAlpha; Drawable icon = mAutoButton.getDrawable().mutate(); icon.setTintList(starTint); mAutoButton.setImageDrawable(icon); - mSeekBar.setProgressTintList(sliderTint); - mSeekBar.setThumbTintList(sliderTint); + mSeekBar.setAlpha(alpha); if (mAuto) { mSeekBar.setProgress(mNotificationImportance);