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

76
src/com/android/settings/datausage/DataSaverBackend.java
View File

@@ -42,8 +42,8 @@ public class DataSaverBackend {
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 @@ public class DataSaverBackend {
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 @@ public class DataSaverBackend {
}
}
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 @@ public class DataSaverBackend {
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 class DataSaverBackend {
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);
}
}