Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6b34c6a authored by Alan Viverette's avatar Alan Viverette
Browse files

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
parent 158a1810

packages/SettingsLib/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ LOCAL_SHARED_ANDROID_LIBRARIES := \ 
    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-v7-appcompat \

    android-support-v14-preference \

    android-arch-lifecycle-runtime



LOCAL_SHARED_JAVA_LIBRARIES := \

packages/SettingsLib/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -48,4 +48,8 @@ 


    <attr name="footerPreferenceStyle" format="reference" />



    <!-- Workaround for b/74248169. These are duplicates of attrs in AndroidX preferences. -->

    <attr name="preferenceStyle" format="reference" />

    <attr name="switchPreferenceStyle" format="reference" />



</resources>

packages/SettingsLib/src/com/android/settingslib/RestrictedPreference.java

+1 −2
Original line number Diff line number Diff line
@@ -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));

    }

packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java

+1 −2
Original line number Diff line number Diff line
@@ -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));

    }