commit ff8312b36b2d0f0c9bd07a74bc73a3f56b15d74c
author Daniel Nishi <dhnishi@google.com> Wed Jun 28 20:54:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 28 20:54:29 2017 +0000
tree 8ad7429fd57461a4f675e854ed78afc6e89efb78
parent e2e54e17c7f22aa38ad7d1647c422910fb813a32
parent d8dce76a1a302ba438c2bb82c47a929040afed3e

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

src/com/android/settings/applications/SpacePreference.java

diff --git a/src/com/android/settings/applications/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java
index d90ff18..58a1dce 100644
--- a/src/com/android/settings/applications/SpacePreference.java
+++ b/src/com/android/settings/applications/SpacePreference.java
@@ -17,6 +17,7 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.support.v4.content.res.TypedArrayUtils;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
@@ -33,7 +34,9 @@
     private int mHeight;
 
     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) {