Update language to comply with Android's inclusive language guidance

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

Bug: 161896447
Test: robotest & manual
Change-Id: Ibe64a68d7bddf84780dfac33555c097ff55c97a8
This commit is contained in:
Edgar Wang
2020-07-29 14:57:34 +08:00
parent 82450ec7f4
commit 8829e515ca
10 changed files with 12 additions and 13 deletions

View File

@@ -329,7 +329,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item" > style="@style/wifi_item" >
<!-- Dummy to enable right-justification of checkbox --> <!-- Placeholder to enable right-justification of checkbox -->
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -439,7 +439,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item" style="@style/wifi_item"
android:visibility="gone"> android:visibility="gone">
<!-- Dummy to enable right-justification of warning --> <!-- Placeholder to enable right-justification of warning -->
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

View File

@@ -239,7 +239,7 @@ public class AddAccountSettings extends Activity {
* or broadcasts. * or broadcasts.
* *
* Unfortunately for legacy reasons we still need to support this. But * Unfortunately for legacy reasons we still need to support this. But
* we can cripple the intent so that 3rd party authenticators can't * we can disable the intent so that 3rd party authenticators can't
* fill in addressing information and launch arbitrary actions. * fill in addressing information and launch arbitrary actions.
*/ */
Intent identityIntent = new Intent(); Intent identityIntent = new Intent();

View File

@@ -51,7 +51,7 @@ public class InstantAppDomainsPreferenceController extends AppInfoPreferenceCont
final String[] handledDomains = final String[] handledDomains =
handledDomainSet.toArray(new String[handledDomainSet.size()]); handledDomainSet.toArray(new String[handledDomainSet.size()]);
instantAppDomainsPreference.setTitles(handledDomains); instantAppDomainsPreference.setTitles(handledDomains);
// Dummy values, unused in the implementation // placeholder values, unused in the implementation
instantAppDomainsPreference.setValues(new int[handledDomains.length]); instantAppDomainsPreference.setValues(new int[handledDomains.length]);
} }

View File

@@ -112,13 +112,13 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
public void run() { public void run() {
final List<ApplicationInfo> apps = mPm.getInstalledApplications( final List<ApplicationInfo> apps = mPm.getInstalledApplications(
PackageManager.GET_DISABLED_COMPONENTS); PackageManager.GET_DISABLED_COMPONENTS);
final List<String> whiteList = Arrays.asList( final List<String> allowList = Arrays.asList(
mContext.getResources().getStringArray( mContext.getResources().getStringArray(
R.array.config_skip_reset_apps_package_name)); R.array.config_skip_reset_apps_package_name));
for (int i = 0; i < apps.size(); i++) { for (int i = 0; i < apps.size(); i++) {
ApplicationInfo app = apps.get(i); ApplicationInfo app = apps.get(i);
if (whiteList.contains(app.packageName)) { if (allowList.contains(app.packageName)) {
continue; continue;
} }
try { try {

View File

@@ -41,7 +41,7 @@ public class TimeFormatPreferenceController extends AbstractPreferenceController
private static final String KEY_TIME_FORMAT = "24 hour"; private static final String KEY_TIME_FORMAT = "24 hour";
// Used for showing the current date format, which looks like "12/31/2010", "2010/12/13", etc. // Used for showing the current date format, which looks like "12/31/2010", "2010/12/13", etc.
// The date value is dummy (independent of actual date). // The date value is stubs (independent of actual date).
private final Calendar mDummyDate; private final Calendar mDummyDate;
private final boolean mIsFromSUW; private final boolean mIsFromSUW;
private final UpdateTimeAndDateCallback mUpdateTimeAndDateCallback; private final UpdateTimeAndDateCallback mUpdateTimeAndDateCallback;

View File

@@ -61,7 +61,7 @@ public class StorageWizardMoveConfirm extends StorageWizardBase {
return; return;
} }
// Sanity check that target volume is candidate // Check that target volume is candidate
Preconditions.checkState( Preconditions.checkState(
getPackageManager().getPackageCandidateVolumes(mApp).contains(mVolume)); getPackageManager().getPackageCandidateVolumes(mApp).contains(mVolume));

View File

@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge.batterytip.tips; package com.android.settings.fuelgauge.batterytip.tips;
import android.content.Context; import android.content.Context;
import android.content.res.ColorStateList;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.util.SparseIntArray; import android.util.SparseIntArray;
@@ -137,7 +136,7 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable {
/** /**
* Check whether data is still make sense. If not, try recover. * Check whether data is still make sense. If not, try recover.
* @param context used to do sanity check * @param context used to do validate check
*/ */
public void sanityCheck(Context context) { public void sanityCheck(Context context) {
// do nothing // do nothing

View File

@@ -378,7 +378,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
boolean launched = false; boolean launched = false;
// The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for // The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for
// CREDENTIAL_MANAGED, we launch the real confirm credential activity with an explicit // CREDENTIAL_MANAGED, we launch the real confirm credential activity with an explicit
// but dummy challenge value (0L). This will result in ConfirmLockPassword calling // but fake challenge value (0L). This will result in ConfirmLockPassword calling
// verifyTiedProfileChallenge() (if it's a profile with unified challenge), due to the // verifyTiedProfileChallenge() (if it's a profile with unified challenge), due to the
// difference between ConfirmLockPassword.startVerifyPassword() and // difference between ConfirmLockPassword.startVerifyPassword() and
// ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is // ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is

View File

@@ -426,7 +426,7 @@ public class SettingsSliceProvider extends SliceProvider {
try { try {
KEY_VALUE_LIST_PARSER.setString(value); KEY_VALUE_LIST_PARSER.setString(value);
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
Log.e(TAG, "Bad Settings Slices Whitelist flags", e); Log.e(TAG, "Bad Settings Slices Allowlist flags", e);
return set; return set;
} }

View File

@@ -45,7 +45,7 @@ public final class ContentCaptureUtils {
public static boolean isFeatureAvailable() { public static boolean isFeatureAvailable() {
// We cannot look for ContentCaptureManager, because it's not available if the service // We cannot look for ContentCaptureManager, because it's not available if the service
// didn't whitelist Settings // didn't allowlist Settings
IBinder service = ServiceManager.checkService(Context.CONTENT_CAPTURE_MANAGER_SERVICE); IBinder service = ServiceManager.checkService(Context.CONTENT_CAPTURE_MANAGER_SERVICE);
return service != null; return service != null;
} }