[Settings] Inclusive language for Data Usage
Change wordings in data usage part into inclusive language.
Bug: 160707804
Test: make RunSettingsRoboTests
Change-Id: I713e52df8201413b884257a51bc1f71a0d43179d
diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
index ed3b5b0..82e3206 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -304,12 +304,12 @@
}
@Override
- public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
// Do nothing
}
@Override
- public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
// Do nothing
}
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 0325842..812ab41 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -218,11 +218,11 @@
}
@Override
- public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
}
@Override
- public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
}
@VisibleForTesting
diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
index 752c6ce..19b8f50 100644
--- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
+++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
@@ -110,7 +110,7 @@
continue;
}
if (entry.extraInfo instanceof DataUsageState
- && ((DataUsageState) entry.extraInfo).isDataSaverWhitelisted) {
+ && ((DataUsageState) entry.extraInfo).isDataSaverAllowlisted) {
count++;
}
}
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index a86459e..460f390 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -235,11 +235,11 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mRestrictBackground) {
- mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);
+ mDataSaverBackend.setIsDenylisted(mAppItem.key, mPackageName, !(Boolean) newValue);
updatePrefs();
return true;
} else if (preference == mUnrestrictedData) {
- mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue);
+ mDataSaverBackend.setIsAllowlisted(mAppItem.key, mPackageName, (Boolean) newValue);
return true;
}
return false;
@@ -330,7 +330,7 @@
private boolean getUnrestrictData() {
if (mDataSaverBackend != null) {
- return mDataSaverBackend.isWhitelisted(mAppItem.key);
+ return mDataSaverBackend.isAllowlisted(mAppItem.key);
}
return false;
}
@@ -464,16 +464,16 @@
}
@Override
- public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
if (mAppItem.uids.get(uid, false)) {
- updatePrefs(getAppRestrictBackground(), isWhitelisted);
+ updatePrefs(getAppRestrictBackground(), isAllowlisted);
}
}
@Override
- public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
if (mAppItem.uids.get(uid, false)) {
- updatePrefs(isBlacklisted, getUnrestrictData());
+ updatePrefs(isDenylisted, getUnrestrictData());
}
}
}
diff --git a/src/com/android/settings/datausage/AppStateDataUsageBridge.java b/src/com/android/settings/datausage/AppStateDataUsageBridge.java
index 0b535d0..b71953e 100644
--- a/src/com/android/settings/datausage/AppStateDataUsageBridge.java
+++ b/src/com/android/settings/datausage/AppStateDataUsageBridge.java
@@ -37,24 +37,24 @@
final int N = apps.size();
for (int i = 0; i < N; i++) {
AppEntry app = apps.get(i);
- app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(app.info.uid),
- mDataSaverBackend.isBlacklisted(app.info.uid));
+ app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(app.info.uid),
+ mDataSaverBackend.isDenylisted(app.info.uid));
}
}
@Override
protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
- app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(uid),
- mDataSaverBackend.isBlacklisted(uid));
+ app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(uid),
+ mDataSaverBackend.isDenylisted(uid));
}
public static class DataUsageState {
- public boolean isDataSaverWhitelisted;
- public boolean isDataSaverBlacklisted;
+ public boolean isDataSaverAllowlisted;
+ public boolean isDataSaverDenylisted;
- public DataUsageState(boolean isDataSaverWhitelisted, boolean isDataSaverBlacklisted) {
- this.isDataSaverWhitelisted = isDataSaverWhitelisted;
- this.isDataSaverBlacklisted = isDataSaverBlacklisted;
+ public DataUsageState(boolean isDataSaverAllowlisted, boolean isDataSaverDenylisted) {
+ this.isDataSaverAllowlisted = isDataSaverAllowlisted;
+ this.isDataSaverDenylisted = isDataSaverDenylisted;
}
}
}
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index 92b2ef9..b9931e0 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -42,8 +42,8 @@
private final NetworkPolicyManager mPolicyManager;
private final ArrayList<Listener> mListeners = new ArrayList<>();
private SparseIntArray mUidPolicies = new SparseIntArray();
- private boolean mWhitelistInitialized;
- private boolean mBlacklistInitialized;
+ private boolean mAllowlistInitialized;
+ private boolean mDenylistInitialized;
// TODO: Staticize into only one.
public DataSaverBackend(Context context) {
@@ -77,63 +77,63 @@
mContext, SettingsEnums.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0);
}
- public void refreshWhitelist() {
- loadWhitelist();
+ public void refreshAllowlist() {
+ loadAllowlist();
}
- public void setIsWhitelisted(int uid, String packageName, boolean whitelisted) {
- final int policy = whitelisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;
+ public void setIsAllowlisted(int uid, String packageName, boolean allowlisted) {
+ final int policy = allowlisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;
mPolicyManager.setUidPolicy(uid, policy);
mUidPolicies.put(uid, policy);
- if (whitelisted) {
+ if (allowlisted) {
mMetricsFeatureProvider.action(
mContext, SettingsEnums.ACTION_DATA_SAVER_WHITELIST, packageName);
}
}
- public boolean isWhitelisted(int uid) {
- loadWhitelist();
+ public boolean isAllowlisted(int uid) {
+ loadAllowlist();
return mUidPolicies.get(uid, POLICY_NONE) == POLICY_ALLOW_METERED_BACKGROUND;
}
- private void loadWhitelist() {
- if (mWhitelistInitialized) {
+ private void loadAllowlist() {
+ if (mAllowlistInitialized) {
return;
}
for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_ALLOW_METERED_BACKGROUND)) {
mUidPolicies.put(uid, POLICY_ALLOW_METERED_BACKGROUND);
}
- mWhitelistInitialized = true;
+ mAllowlistInitialized = true;
}
- public void refreshBlacklist() {
- loadBlacklist();
+ public void refreshDenylist() {
+ loadDenylist();
}
- public void setIsBlacklisted(int uid, String packageName, boolean blacklisted) {
- final int policy = blacklisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;
+ public void setIsDenylisted(int uid, String packageName, boolean denylisted) {
+ final int policy = denylisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;
mPolicyManager.setUidPolicy(uid, policy);
mUidPolicies.put(uid, policy);
- if (blacklisted) {
+ if (denylisted) {
mMetricsFeatureProvider.action(
mContext, SettingsEnums.ACTION_DATA_SAVER_BLACKLIST, packageName);
}
}
- public boolean isBlacklisted(int uid) {
- loadBlacklist();
+ public boolean isDenylisted(int uid) {
+ loadDenylist();
return mUidPolicies.get(uid, POLICY_NONE) == POLICY_REJECT_METERED_BACKGROUND;
}
- private void loadBlacklist() {
- if (mBlacklistInitialized) {
+ private void loadDenylist() {
+ if (mDenylistInitialized) {
return;
}
for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND)) {
mUidPolicies.put(uid, POLICY_REJECT_METERED_BACKGROUND);
}
- mBlacklistInitialized = true;
+ mDenylistInitialized = true;
}
private void handleRestrictBackgroundChanged(boolean isDataSaving) {
@@ -142,21 +142,21 @@
}
}
- private void handleWhitelistChanged(int uid, boolean isWhitelisted) {
+ private void handleAllowlistChanged(int uid, boolean isAllowlisted) {
for (int i = 0; i < mListeners.size(); i++) {
- mListeners.get(i).onWhitelistStatusChanged(uid, isWhitelisted);
+ mListeners.get(i).onAllowlistStatusChanged(uid, isAllowlisted);
}
}
- private void handleBlacklistChanged(int uid, boolean isBlacklisted) {
+ private void handleDenylistChanged(int uid, boolean isDenylisted) {
for (int i = 0; i < mListeners.size(); i++) {
- mListeners.get(i).onBlacklistStatusChanged(uid, isBlacklisted);
+ mListeners.get(i).onDenylistStatusChanged(uid, isDenylisted);
}
}
private void handleUidPoliciesChanged(int uid, int newPolicy) {
- loadWhitelist();
- loadBlacklist();
+ loadAllowlist();
+ loadDenylist();
final int oldPolicy = mUidPolicies.get(uid, POLICY_NONE);
if (newPolicy == POLICY_NONE) {
@@ -165,17 +165,17 @@
mUidPolicies.put(uid, newPolicy);
}
- final boolean wasWhitelisted = oldPolicy == POLICY_ALLOW_METERED_BACKGROUND;
- final boolean wasBlacklisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
- final boolean isWhitelisted = newPolicy == POLICY_ALLOW_METERED_BACKGROUND;
- final boolean isBlacklisted = newPolicy == POLICY_REJECT_METERED_BACKGROUND;
+ final boolean wasAllowlisted = oldPolicy == POLICY_ALLOW_METERED_BACKGROUND;
+ final boolean wasDenylisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
+ final boolean isAllowlisted = newPolicy == POLICY_ALLOW_METERED_BACKGROUND;
+ final boolean isDenylisted = newPolicy == POLICY_REJECT_METERED_BACKGROUND;
- if (wasWhitelisted != isWhitelisted) {
- handleWhitelistChanged(uid, isWhitelisted);
+ if (wasAllowlisted != isAllowlisted) {
+ handleAllowlistChanged(uid, isAllowlisted);
}
- if (wasBlacklisted != isBlacklisted) {
- handleBlacklistChanged(uid, isBlacklisted);
+ if (wasDenylisted != isDenylisted) {
+ handleDenylistChanged(uid, isDenylisted);
}
}
@@ -211,8 +211,8 @@
public interface Listener {
void onDataSaverChanged(boolean isDataSaving);
- void onWhitelistStatusChanged(int uid, boolean isWhitelisted);
+ void onAllowlistStatusChanged(int uid, boolean isAllowlisted);
- void onBlacklistStatusChanged(int uid, boolean isBlacklisted);
+ void onDenylistStatusChanged(int uid, boolean isDenylisted);
}
}
diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java
index 79e4c13..305d061 100644
--- a/src/com/android/settings/datausage/DataSaverPreference.java
+++ b/src/com/android/settings/datausage/DataSaverPreference.java
@@ -48,10 +48,10 @@
}
@Override
- public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
}
@Override
- public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
}
}
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index 0e32bfd..7017fe1 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -82,8 +82,8 @@
@Override
public void onResume() {
super.onResume();
- mDataSaverBackend.refreshWhitelist();
- mDataSaverBackend.refreshBlacklist();
+ mDataSaverBackend.refreshAllowlist();
+ mDataSaverBackend.refreshDenylist();
mDataSaverBackend.addListener(this);
mDataUsageBridge.resume();
}
@@ -125,11 +125,11 @@
}
@Override
- public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
}
@Override
- public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
}
@Override
@@ -146,7 +146,7 @@
continue;
}
if (entry.extraInfo != null && ((AppStateDataUsageBridge.DataUsageState)
- entry.extraInfo).isDataSaverWhitelisted) {
+ entry.extraInfo).isDataSaverAllowlisted) {
count++;
}
}
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
index 97ed5ac..902754a 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
@@ -79,15 +79,15 @@
@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 @@
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 @@
}
@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 @@
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("");
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
index d8656ca..00f4a7b 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
@@ -186,11 +186,11 @@
if (preference instanceof UnrestrictedDataAccessPreference) {
final UnrestrictedDataAccessPreference
accessPreference = (UnrestrictedDataAccessPreference) preference;
- boolean whitelisted = newValue == Boolean.TRUE;
- logSpecialPermissionChange(whitelisted, accessPreference.getEntry().info.packageName);
- mDataSaverBackend.setIsWhitelisted(accessPreference.getEntry().info.uid,
- accessPreference.getEntry().info.packageName, whitelisted);
- accessPreference.getDataUsageState().isDataSaverWhitelisted = whitelisted;
+ boolean allowlisted = newValue == Boolean.TRUE;
+ logSpecialPermissionChange(allowlisted, accessPreference.getEntry().info.packageName);
+ mDataSaverBackend.setIsAllowlisted(accessPreference.getEntry().info.uid,
+ accessPreference.getEntry().info.packageName, allowlisted);
+ accessPreference.getDataUsageState().isDataSaverAllowlisted = allowlisted;
return true;
}
return false;
@@ -224,8 +224,8 @@
}
@VisibleForTesting
- void logSpecialPermissionChange(boolean whitelisted, String packageName) {
- final int logCategory = whitelisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
+ void logSpecialPermissionChange(boolean allowlisted, String packageName) {
+ final int logCategory = allowlisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
: SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_DENY;
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext,
logCategory, packageName);
diff --git a/src/com/android/settings/network/TetherBasePreferenceController.java b/src/com/android/settings/network/TetherBasePreferenceController.java
index 36ce2a4..1919770 100644
--- a/src/com/android/settings/network/TetherBasePreferenceController.java
+++ b/src/com/android/settings/network/TetherBasePreferenceController.java
@@ -129,11 +129,11 @@
}
@Override
- public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
}
@Override
- public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
}
/**
diff --git a/src/com/android/settings/network/TetherEnabler.java b/src/com/android/settings/network/TetherEnabler.java
index b3c6d61..6ab4cb2 100644
--- a/src/com/android/settings/network/TetherEnabler.java
+++ b/src/com/android/settings/network/TetherEnabler.java
@@ -368,12 +368,12 @@
}
@Override
- public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
// we don't care, since we just want to read the value
}
@Override
- public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
// we don't care, since we just want to read the value
}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
index 912fb8c..e83eb1c 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -162,12 +162,12 @@
}
@Override
- public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
// we don't care, since we just want to read the value
}
@Override
- public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
// we don't care, since we just want to read the value
}
}