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

Update language to comply with Android's inclusive language guidance

Browse Source 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: Ia8625091a107fc3fb652d3ba3f75ea3cc1a8d9f5
This commit is contained in:
Edgar Wang
2020-08-06 21:13:41 +08:00
parent 232aaec569
commit a8742aa7ab
30 changed files with 95 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
View File

@@ -159,7 +159,7 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
keepEnabledPackages.add(euicc.packageName);
}
keepEnabledPackages.addAll(getEnabledPackageWhitelist());
keepEnabledPackages.addAll(getEnabledPackageAllowlist());
final LocationManager locationManager =
(LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
@@ -170,7 +170,7 @@ public class ApplicationFeatureProviderImpl implements ApplicationFeatureProvide
return keepEnabledPackages;
}
private Set<String> getEnabledPackageWhitelist() {
private Set<String> getEnabledPackageAllowlist() {
final Set<String> keepEnabledPackages = new ArraySet<>();
// Keep Settings intelligence enabled, otherwise search feature will be disabled.

6
src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
View File

@@ -142,7 +142,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
}
private void logNonConfigurableAppMetrics() {
if (!isCrossProfilePackageWhitelisted(mPackageName)) {
if (!isCrossProfilePackageAllowlisted(mPackageName)) {
logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_ADMIN_RESTRICTED);
return;
}
@@ -382,7 +382,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
private boolean refreshUiForNonConfigurableApps() {
mSwitchPref.setChecked(false);
mSwitchPref.setTitle(R.string.interact_across_profiles_switch_disabled);
if (!isCrossProfilePackageWhitelisted(mPackageName)) {
if (!isCrossProfilePackageAllowlisted(mPackageName)) {
mInstallBanner.setVisible(false);
mSwitchPref.setDisabledByAdmin(RestrictedLockUtils.getProfileOrDeviceOwner(
mContext, mWorkProfile));
@@ -417,7 +417,7 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
return false;
}
private boolean isCrossProfilePackageWhitelisted(String packageName) {
private boolean isCrossProfilePackageAllowlisted(String packageName) {
return mContext.getSystemService(DevicePolicyManager.class)
.getAllCrossProfilePackages().contains(packageName);
}