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

Merge "Use the proper style for the SpacePreference." into oc-dr1-dev

Browse Source 
am: ff8312b36b

Change-Id: I44d02a388a2d8c9dd8a797f78fce67a856bc22e5
This commit is contained in:
Daniel Nishi
2017-06-28 20:59:31 +00:00
committed by android-build-merger
parent d4075ea983 ff8312b36b
commit e440fdb769
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/applications/SpacePreference.java
View File

@@ -17,6 +17,7 @@ package com.android.settings.applications;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.support.v4.content.res.TypedArrayUtils;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceViewHolder; import android.support.v7.preference.PreferenceViewHolder;
import android.util.AttributeSet; import android.util.AttributeSet;
@@ -33,7 +34,9 @@ public class SpacePreference extends Preference {
private int mHeight; private int mHeight;
public SpacePreference(Context context, AttributeSet attrs) { public SpacePreference(Context context, AttributeSet attrs) {
this(context, attrs, com.android.internal.R.attr.preferenceStyle); this(context, attrs, TypedArrayUtils.getAttr(context,
android.support.v7.preference.R.attr.preferenceStyle,
android.R.attr.preferenceStyle));
} }
public SpacePreference(Context context, AttributeSet attrs, int defStyleAttr) { public SpacePreference(Context context, AttributeSet attrs, int defStyleAttr) {