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

Commit 8f9b8248 authored by Arc Wang's avatar Arc Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix resource problem in SettingsSliderPreferenceControllerTest" into sc-dev am: f155ee17 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13981605

Change-Id: Iaf8cf9e572bfaf023925169cc22f5fcf26ea59a5
parents e57ee598 f155ee17

packages/SettingsLib/TwoTargetPreference/src/com/android/settingslib/widget/TwoTargetPreference.java

+6 −2
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ public class TwoTargetPreference extends Preference { 
    private void init(Context context) {

        setLayoutResource(R.layout.preference_two_target);

        mSmallIconSize = context.getResources().getDimensionPixelSize(

                R.dimen.two_target_pref_small_icon_size);

                resourceId(context, "dimen", "two_target_pref_small_icon_size"));

        mMediumIconSize = context.getResources().getDimensionPixelSize(

                R.dimen.two_target_pref_medium_icon_size);

                resourceId(context, "dimen", "two_target_pref_medium_icon_size"));

        final int secondTargetResId = getSecondTargetResId();

        if (secondTargetResId != 0) {

            setWidgetLayoutResource(secondTargetResId);
@@ -116,4 +116,8 @@ public class TwoTargetPreference extends Preference { 
    protected int getSecondTargetResId() {

        return 0;

    }



    private int resourceId(Context context, String type, String name) {

        return context.getResources().getIdentifier(name, type, context.getPackageName());

    }

}