PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Settings] Inclusive language for Data Usage

Browse Source 
Change wordings in data usage part into inclusive language.

Bug: 160707804
Test: make RunSettingsRoboTests
Change-Id: I713e52df8201413b884257a51bc1f71a0d43179d
This commit is contained in:
Bonian Chen
2020-07-08 02:47:18 +08:00
parent 0d34f6c80b
commit a5f08854e3
16 changed files with 120 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
View File

@@ -79,15 +79,15 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
@Override
protected void onClick() {
if (mDataUsageState.isDataSaverBlacklisted) {
// app is blacklisted, launch App Data Usage screen
if (mDataUsageState.isDataSaverDenylisted) {
// app is denylisted, launch App Data Usage screen
AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class,
R.string.data_usage_app_summary_title,
null /* arguments */,
mParentFragment,
mEntry);
} else {
// app is not blacklisted, let superclass handle toggle switch
// app is not denylisted, let superclass handle toggle switch
super.onClick();
}
}
@@ -119,7 +119,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
widgetFrame.setVisibility(View.VISIBLE);
} else {
widgetFrame.setVisibility(
mDataUsageState != null && mDataUsageState.isDataSaverBlacklisted
mDataUsageState != null && mDataUsageState.isDataSaverDenylisted
? View.INVISIBLE : View.VISIBLE);
}
super.onBindViewHolder(holder);
@@ -136,17 +136,17 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
}
@Override
public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
if (mDataUsageState != null && mEntry.info.uid == uid) {
mDataUsageState.isDataSaverWhitelisted = isWhitelisted;
mDataUsageState.isDataSaverAllowlisted = isAllowlisted;
updateState();
}
}
@Override
public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
if (mDataUsageState != null && mEntry.info.uid == uid) {
mDataUsageState.isDataSaverBlacklisted = isBlacklisted;
mDataUsageState.isDataSaverDenylisted = isDenylisted;
updateState();
}
}
@@ -167,14 +167,14 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
mHelper.setDisabledByAdmin(admin);
}
// Sets UI state based on whitelist/blacklist status.
// Sets UI state based on allowlist/denylist status.
public void updateState() {
setTitle(mEntry.label);
if (mDataUsageState != null) {
setChecked(mDataUsageState.isDataSaverWhitelisted);
setChecked(mDataUsageState.isDataSaverAllowlisted);
if (isDisabledByAdmin()) {
setSummary(R.string.disabled_by_admin);
} else if (mDataUsageState.isDataSaverBlacklisted) {
} else if (mDataUsageState.isDataSaverDenylisted) {
setSummary(R.string.restrict_background_blacklisted);
} else {
setSummary("");