diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-06-17 00:33:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-16 15:46:16 +0000 |
| commit | 6b2df21ecacfa6826a85cabdf8d6fe0e81fe11d9 (patch) | |
| tree | 49e2cc625927918765c53b2b385736304c0dd7d8 /core/java | |
| parent | 2fc02ba031076414dd569d2044c1923b40e3bad4 (diff) | |
| parent | 19ae4ca5a7d84a8a79feba560b024120b56b55b8 (diff) | |
| download | frameworks_base-6b2df21ecacfa6826a85cabdf8d6fe0e81fe11d9.zip frameworks_base-6b2df21ecacfa6826a85cabdf8d6fe0e81fe11d9.tar.gz frameworks_base-6b2df21ecacfa6826a85cabdf8d6fe0e81fe11d9.tar.bz2 | |
Merge "Fix SeekBarPreference Theming"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/preference/SeekBarPreference.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/core/java/android/preference/SeekBarPreference.java b/core/java/android/preference/SeekBarPreference.java index e32890d..67f6409 100644 --- a/core/java/android/preference/SeekBarPreference.java +++ b/core/java/android/preference/SeekBarPreference.java @@ -40,11 +40,19 @@ public class SeekBarPreference extends Preference Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - final TypedArray a = context.obtainStyledAttributes( + TypedArray a = context.obtainStyledAttributes( attrs, com.android.internal.R.styleable.ProgressBar, defStyleAttr, defStyleRes); setMax(a.getInt(com.android.internal.R.styleable.ProgressBar_max, mMax)); a.recycle(); - setLayoutResource(com.android.internal.R.layout.preference_widget_seekbar); + + a = context.obtainStyledAttributes(attrs, + com.android.internal.R.styleable.SeekBarPreference, defStyleAttr, defStyleRes); + final int layoutResId = a.getResourceId( + com.android.internal.R.styleable.SeekBarPreference_layout, + com.android.internal.R.layout.preference_widget_seekbar); + a.recycle(); + + setLayoutResource(layoutResId); } public SeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) { @@ -52,7 +60,7 @@ public class SeekBarPreference extends Preference } public SeekBarPreference(Context context, AttributeSet attrs) { - this(context, attrs, 0); + this(context, attrs, com.android.internal.R.attr.seekBarPreferenceStyle); } public SeekBarPreference(Context context) { |