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

Merge "Fix resource problem in SettingsSliderPreferenceControllerTest" into sc-dev

Browse Source
This commit is contained in:
Arc Wang
2021-03-24 11:17:53 +00:00
committed by Android (Google) Code Review
parent d73bd69f33 4dad9087ab
commit f155ee1742
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) { private void init(Context context) {
setLayoutResource(R.layout.preference_two_target); setLayoutResource(R.layout.preference_two_target);
mSmallIconSize = context.getResources().getDimensionPixelSize( 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( 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(); final int secondTargetResId = getSecondTargetResId();
if (secondTargetResId != 0) { if (secondTargetResId != 0) {
setWidgetLayoutResource(secondTargetResId); setWidgetLayoutResource(secondTargetResId);
@@ -116,4 +116,8 @@ public class TwoTargetPreference extends Preference {
protected int getSecondTargetResId() { protected int getSecondTargetResId() {
return 0; return 0;
} }
private int resourceId(Context context, String type, String name) {
return context.getResources().getIdentifier(name, type, context.getPackageName());
}
} }