[Settings] Inclusive language for Data Usage (a5f08854) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/AllInOneTetherSettings.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -304,12 +304,12 @@ public class AllInOneTetherSettings extends RestrictedDashboardFragment
	}		}

	@Override		@Override
	public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {		public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
	// Do nothing		// Do nothing
	}		}

	@Override		@Override
	public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {		public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
	// Do nothing		// Do nothing
	}		}

src/com/android/settings/TetherSettings.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -218,11 +218,11 @@ public class TetherSettings extends RestrictedSettingsFragment
	}		}

	@Override		@Override
	public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {		public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
	}		}

	@Override		@Override
	public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {		public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
	}		}

	@VisibleForTesting		@VisibleForTesting

src/com/android/settings/applications/SpecialAppAccessPreferenceController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -110,7 +110,7 @@ public class SpecialAppAccessPreferenceController extends BasePreferenceControll
	continue;		continue;
	}		}
	if (entry.extraInfo instanceof DataUsageState		if (entry.extraInfo instanceof DataUsageState
	&& ((DataUsageState) entry.extraInfo).isDataSaverWhitelisted) {		&& ((DataUsageState) entry.extraInfo).isDataSaverAllowlisted) {
	count++;		count++;
	}		}
	}		}

src/com/android/settings/datausage/AppDataUsage.java

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -235,11 +235,11 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
	@Override		@Override
	public boolean onPreferenceChange(Preference preference, Object newValue) {		public boolean onPreferenceChange(Preference preference, Object newValue) {
	if (preference == mRestrictBackground) {		if (preference == mRestrictBackground) {
	mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);		mDataSaverBackend.setIsDenylisted(mAppItem.key, mPackageName, !(Boolean) newValue);
	updatePrefs();		updatePrefs();
	return true;		return true;
	} else if (preference == mUnrestrictedData) {		} else if (preference == mUnrestrictedData) {
	mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue);		mDataSaverBackend.setIsAllowlisted(mAppItem.key, mPackageName, (Boolean) newValue);
	return true;		return true;
	}		}
	return false;		return false;
	@@ -330,7 +330,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC

	private boolean getUnrestrictData() {		private boolean getUnrestrictData() {
	if (mDataSaverBackend != null) {		if (mDataSaverBackend != null) {
	return mDataSaverBackend.isWhitelisted(mAppItem.key);		return mDataSaverBackend.isAllowlisted(mAppItem.key);
	}		}
	return false;		return false;
	}		}
	@@ -464,16 +464,16 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
	}		}

	@Override		@Override
	public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {		public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
	if (mAppItem.uids.get(uid, false)) {		if (mAppItem.uids.get(uid, false)) {
	updatePrefs(getAppRestrictBackground(), isWhitelisted);		updatePrefs(getAppRestrictBackground(), isAllowlisted);
	}		}
	}		}

	@Override		@Override
	public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {		public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
	if (mAppItem.uids.get(uid, false)) {		if (mAppItem.uids.get(uid, false)) {
	updatePrefs(isBlacklisted, getUnrestrictData());		updatePrefs(isDenylisted, getUnrestrictData());
	}		}
	}		}
	}		}

src/com/android/settings/datausage/AppStateDataUsageBridge.java

+9 −9

Original line number	Original line	Diff line number	Diff line
	@@ -37,24 +37,24 @@ public class AppStateDataUsageBridge extends AppStateBaseBridge {
	final int N = apps.size();		final int N = apps.size();
	for (int i = 0; i < N; i++) {		for (int i = 0; i < N; i++) {
	AppEntry app = apps.get(i);		AppEntry app = apps.get(i);
	app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(app.info.uid),		app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(app.info.uid),
	mDataSaverBackend.isBlacklisted(app.info.uid));		mDataSaverBackend.isDenylisted(app.info.uid));
	}		}
	}		}

	@Override		@Override
	protected void updateExtraInfo(AppEntry app, String pkg, int uid) {		protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
	app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(uid),		app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(uid),
	mDataSaverBackend.isBlacklisted(uid));		mDataSaverBackend.isDenylisted(uid));
	}		}

	public static class DataUsageState {		public static class DataUsageState {
	public boolean isDataSaverWhitelisted;		public boolean isDataSaverAllowlisted;
	public boolean isDataSaverBlacklisted;		public boolean isDataSaverDenylisted;

	public DataUsageState(boolean isDataSaverWhitelisted, boolean isDataSaverBlacklisted) {		public DataUsageState(boolean isDataSaverAllowlisted, boolean isDataSaverDenylisted) {
	this.isDataSaverWhitelisted = isDataSaverWhitelisted;		this.isDataSaverAllowlisted = isDataSaverAllowlisted;
	this.isDataSaverBlacklisted = isDataSaverBlacklisted;		this.isDataSaverDenylisted = isDataSaverDenylisted;
	}		}
	}		}
	}		}