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

Commit 9ecfce3b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Clean up SettingsLib dependencies" into pi-dev

parents 45344b58 c6b34c6a

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));

    }