Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix resource problem in SettingsSliderPreferenceControllerTest

Browse Source 
Somehow Resource IDs are inconsistent between Settings and
SettingsUnitTests. This is a workaround for NotFoundException
in SettingsUnitTests.


Bug: 183340630
Test: atest SettingsSliderPreferenceControllerTest
Change-Id: I72fef4856317ebf9fb1a667ddb910878185aae39
This commit is contained in:
Arc Wang
2021-03-24 16:36:05 +08:00
parent 585b50136e
commit 4dad9087ab
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/TwoTargetPreference/src/com/android/settingslib/widget/TwoTargetPreference.java
View File

@@ -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());
}
}