Merge "[Settings] Inclusive language for Data Usage" (01daee8c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/AllInOneTetherSettings.java

+2 −2

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

		@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
		}

src/com/android/settings/TetherSettings.java

+2 −2

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

		@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

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

+1 −1

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

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -235,11 +235,11 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
		@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 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC

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

		@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());
		}
		}
		}

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -37,24 +37,24 @@ public class AppStateDataUsageBridge extends AppStateBaseBridge {
		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;
		}
		}
		}