diff options
| author | Alan Viverette <alanv@google.com> | 2018-03-21 15:07:32 -0400 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2018-03-23 11:39:25 -0400 |
| commit | 945998beba548abdecc4cbf3005db4b3c49f6f3b (patch) | |
| tree | a53388b6a9be3fb67b308d5336840069675c2f89 /packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java | |
| parent | 7d0ece3f13f55dfd295215e12a7d55afc19b5ff3 (diff) | |
Clean up SettingsLib dependencies
v14-preferences is an empty lib and libraries cannot directly
reference other libraries' R classes due to a bug in Make builds
Bug: 73250914
Bug: 74248169
Test: make && make checkbuild
Change-Id: Id156b2a2140cabc98b58b5312ea28da42f4ca63b
Diffstat (limited to 'packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java index 9f21dd21d6ca..b4a3b51809ce 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java @@ -44,8 +44,7 @@ public class RestrictedPreference extends TwoTargetPreference { } public RestrictedPreference(Context context, AttributeSet attrs) { - this(context, attrs, TypedArrayUtils.getAttr(context, - android.support.v7.preference.R.attr.preferenceStyle, + this(context, attrs, TypedArrayUtils.getAttr(context, R.attr.preferenceStyle, android.R.attr.preferenceStyle)); } |