From 714d7be0ee42b8fa3ae8546a3a67752d7cbd2428 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Thu, 25 Mar 2021 14:29:32 +0800 Subject: [PATCH] Fix resource problem in PrivateVolumeForgetTest Somehow Resource IDs are inconsistent between SettingsLib and SettingsUnitTests. This is a workaround for NotFoundException in SettingsUnitTests. Bug: 183342958 Test: atest com.android.settings.deviceinfo.PrivateVolumeForgetTest Change-Id: If513d5796d4dcd50261d9dd366f6a0def51e0ec4 --- .../src/com/android/settingslib/widget/MainSwitchBar.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java index 8d9a562fede7c..ae9261c48419e 100644 --- a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java +++ b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java @@ -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()); + } }