diff options
| author | Alan Viverette <alanv@google.com> | 2018-03-21 15:07:32 -0400 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2018-03-24 00:27:39 +0000 |
| commit | c6b34c6aedba0fa90ff0b4c5a6d88021dff5062e (patch) | |
| tree | e422c4f741f50249f67517c679382f225de8851b /packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java | |
| parent | 158a18108bdc726821f2d2b3119535a7c747130b (diff) | |
DO NOT MERGE 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/RestrictedSwitchPreference.java')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java index 1ad710a6d731..48b7c3588840 100644 --- a/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java +++ b/packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java @@ -82,8 +82,7 @@ public class RestrictedSwitchPreference extends SwitchPreference { } public RestrictedSwitchPreference(Context context, AttributeSet attrs) { - this(context, attrs, TypedArrayUtils.getAttr(context, - android.support.v7.preference.R.attr.switchPreferenceStyle, + this(context, attrs, TypedArrayUtils.getAttr(context, R.attr.switchPreferenceStyle, android.R.attr.switchPreferenceStyle)); } |