Merge \\"Update Settings to use DeviceDefault.Settings.\\" into nyc-mr1-dev am: 70ff5f8fa1

am: 61c34c0556

Change-Id: I765efb2be73d4791cac1f53d491efb533bbbe20e
This commit is contained in:
Andrew Sapperstein
2016-06-22 00:55:25 +00:00
committed by android-build-merger
7 changed files with 18 additions and 46 deletions

View File

@@ -16,8 +16,6 @@
package com.android.settings.notification;
import android.content.res.Resources;
import android.util.TypedValue;
import com.android.settings.R;
import com.android.settings.SeekBarPreference;
@@ -33,6 +31,7 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.SeekBar;
import android.widget.TextView;
import com.android.settings.Utils;
/**
* A slider preference that controls notification importance.
@@ -57,10 +56,7 @@ public class ImportanceSeekBarPreference extends SeekBarPreference implements
int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
setLayoutResource(R.layout.preference_importance_slider);
Resources.Theme theme = context.getTheme();
TypedValue typedValue = new TypedValue();
theme.resolveAttribute(android.R.attr.colorAccent, typedValue, true);
mActiveSliderTint = ColorStateList.valueOf(context.getColor(typedValue.resourceId));
mActiveSliderTint = ColorStateList.valueOf(Utils.getColorAccent(context));
mInactiveSliderTint = ColorStateList.valueOf(
context.getColor(R.color.importance_disabled_slider_color));
mHandler = new Handler();