Merge "Fix references to resources for Settings" into main

This commit is contained in:
Chaohui Wang
2023-08-08 08:40:42 +00:00
committed by Android (Google) Code Review
247 changed files with 859 additions and 721 deletions

View File

@@ -176,7 +176,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
if (mDataUsageState != null) {
setChecked(mDataUsageState.isDataSaverAllowlisted);
if (isDisabledByAdmin()) {
setSummary(R.string.disabled_by_admin);
setSummary(com.android.settingslib.widget.R.string.disabled_by_admin);
} else if (mDataUsageState.isDataSaverDenylisted) {
setSummary(R.string.restrict_background_blocklisted);
} else {