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

Merge "Importance slider updates." into nyc-dev

Browse Source 
am: 7c2c025e4f

* commit '7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
  Importance slider updates.

Change-Id: Ieb897d94383c401154fde35dc9bf94ca57ce1ca6
This commit is contained in:
Julia Reynolds
2016-05-27 04:04:31 +00:00
committed by android-build-merger
parent 39d2913e1c 7c2c025e4f
commit b0f0d299cf
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="@color/importance_slider_color"
android:progressTint="@color/importance_slider_color"
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);