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

Commit 62668e58 authored by Arc Wang's avatar Arc Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix resource problem in PrivateVolumeForgetTest" into sc-dev am: 18227fa3 

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

Change-Id: Ia58dc041f59b8b4255c26fb9c09d492ff99a0908
parents 39846a14 18227fa3

packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java

+6 −1
Original line number Diff line number Diff line
@@ -63,7 +63,8 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec 
            int defStyleRes) {

        super(context, attrs, defStyleAttr, defStyleRes);



        LayoutInflater.from(context).inflate(R.layout.main_switch_bar, this);

        LayoutInflater.from(context).inflate(resourceId(context, "layout", "main_switch_bar"),

                this);



        setFocusable(true);

        setClickable(true);
@@ -255,4 +256,8 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec 


        requestLayout();

    }



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

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

    }

}