PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Importance slider updates.

Browse Source 
am: 9782079130

* commit '9782079130fb6dd3a83bedde31afa4df6a03b63c':
  Importance slider updates.

Change-Id: I267f2237a759b9f86a1b507b1d627ce5367c6cfe
This commit is contained in:
Julia Reynolds
2016-05-27 15:18:08 +00:00
committed by android-build-merger
parent 38e93b85f0 9782079130
commit af2e6d69a6
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/preference_importance_slider.xml
View File

@@ -58,8 +58,8 @@
android:focusable="true"
android:background="#00ffffff"
android:progressBackgroundTint="@color/importance_secondary_slider_color"
android:thumbTint="@color/importance_disabled_slider_color"
android:progressTint="@color/importance_disabled_slider_color"
android:thumbTint="?android:attr/colorAccent"
android:progressTint="?android:attr/colorAccent"
style="@android:style/Widget.Material.SeekBar.Discrete"
android:tickMarkTint="@android:color/black" />

13
src/com/android/settings/notification/ImportanceSeekBarPreference.java
View File

@@ -23,6 +23,7 @@ import com.android.settings.SeekBarPreference;
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.service.notification.NotificationListenerService;
@@ -47,6 +48,8 @@ public class ImportanceSeekBarPreference extends SeekBarPreference implements
private SeekBar mSeekBar;
private ColorStateList mActiveSliderTint;
private ColorStateList mInactiveSliderTint;
private float mActiveSliderAlpha = 1.0f;
private float mInactiveSliderAlpha;
private boolean mAutoOn;
private Handler mHandler;
@@ -61,6 +64,11 @@ public class ImportanceSeekBarPreference extends SeekBarPreference implements
mInactiveSliderTint = ColorStateList.valueOf(
context.getColor(R.color.importance_disabled_slider_color));
mHandler = new Handler();
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 ImportanceSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -128,13 +136,12 @@ public class ImportanceSeekBarPreference extends SeekBarPreference implements
private void applyAutoUi(ImageView autoButton) {
mSeekBar.setEnabled(!mAutoOn);
final ColorStateList sliderTint = mAutoOn ? mInactiveSliderTint : mActiveSliderTint;
final float alpha = mAutoOn ? mInactiveSliderAlpha : mActiveSliderAlpha;
final ColorStateList starTint = mAutoOn ? mActiveSliderTint : mInactiveSliderTint;
Drawable icon = autoButton.getDrawable().mutate();
icon.setTintList(starTint);
autoButton.setImageDrawable(icon);
mSeekBar.setProgressTintList(sliderTint);
mSeekBar.setThumbTintList(sliderTint);
mSeekBar.setAlpha(alpha);
if (mAutoOn) {
setProgress(NotificationListenerService.Ranking.IMPORTANCE_DEFAULT);