Merge "Align seek bar type preferences to reserve icon space"

This commit is contained in:
TreeHugger Robot
2016-12-27 20:06:41 +00:00
committed by Android (Google) Code Review
8 changed files with 114 additions and 72 deletions

View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.content.res.TypedArrayUtils;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet;
@@ -64,7 +65,9 @@ public class SeekBarPreference extends RestrictedPreference
}
public SeekBarPreference(Context context, AttributeSet attrs) {
this(context, attrs, com.android.internal.R.attr.seekBarPreferenceStyle);
this(context, attrs, TypedArrayUtils.getAttr(context,
android.support.v7.preference.R.attr.seekBarPreferenceStyle,
com.android.internal.R.attr.seekBarPreferenceStyle));
}
public SeekBarPreference(Context context) {