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:
@@ -329,7 +329,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item" >
|
||||
<!-- Dummy to enable right-justification of checkbox -->
|
||||
<!-- Placeholder to enable right-justification of checkbox -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -439,7 +439,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
style="@style/wifi_item"
|
||||
android:visibility="gone">
|
||||
<!-- Dummy to enable right-justification of warning -->
|
||||
<!-- Placeholder to enable right-justification of warning -->
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
@@ -239,7 +239,7 @@ public class AddAccountSettings extends Activity {
|
||||
* or broadcasts.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
Intent identityIntent = new Intent();
|
||||
|
@@ -51,7 +51,7 @@ public class InstantAppDomainsPreferenceController extends AppInfoPreferenceCont
|
||||
final String[] handledDomains =
|
||||
handledDomainSet.toArray(new String[handledDomainSet.size()]);
|
||||
instantAppDomainsPreference.setTitles(handledDomains);
|
||||
// Dummy values, unused in the implementation
|
||||
// placeholder values, unused in the implementation
|
||||
instantAppDomainsPreference.setValues(new int[handledDomains.length]);
|
||||
}
|
||||
|
||||
|
@@ -112,13 +112,13 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
|
||||
public void run() {
|
||||
final List<ApplicationInfo> apps = mPm.getInstalledApplications(
|
||||
PackageManager.GET_DISABLED_COMPONENTS);
|
||||
final List<String> whiteList = Arrays.asList(
|
||||
final List<String> allowList = Arrays.asList(
|
||||
mContext.getResources().getStringArray(
|
||||
R.array.config_skip_reset_apps_package_name));
|
||||
|
||||
for (int i = 0; i < apps.size(); i++) {
|
||||
ApplicationInfo app = apps.get(i);
|
||||
if (whiteList.contains(app.packageName)) {
|
||||
if (allowList.contains(app.packageName)) {
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
|
@@ -41,7 +41,7 @@ public class TimeFormatPreferenceController extends AbstractPreferenceController
|
||||
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.
|
||||
// The date value is dummy (independent of actual date).
|
||||
// The date value is stubs (independent of actual date).
|
||||
private final Calendar mDummyDate;
|
||||
private final boolean mIsFromSUW;
|
||||
private final UpdateTimeAndDateCallback mUpdateTimeAndDateCallback;
|
||||
|
@@ -61,7 +61,7 @@ public class StorageWizardMoveConfirm extends StorageWizardBase {
|
||||
return;
|
||||
}
|
||||
|
||||
// Sanity check that target volume is candidate
|
||||
// Check that target volume is candidate
|
||||
Preconditions.checkState(
|
||||
getPackageManager().getPackageCandidateVolumes(mApp).contains(mVolume));
|
||||
|
||||
|
@@ -17,7 +17,6 @@
|
||||
package com.android.settings.fuelgauge.batterytip.tips;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.res.ColorStateList;
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
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.
|
||||
* @param context used to do sanity check
|
||||
* @param context used to do validate check
|
||||
*/
|
||||
public void sanityCheck(Context context) {
|
||||
// do nothing
|
||||
|
@@ -378,7 +378,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
|
||||
boolean launched = false;
|
||||
// The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for
|
||||
// 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
|
||||
// difference between ConfirmLockPassword.startVerifyPassword() and
|
||||
// ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is
|
||||
|
@@ -426,7 +426,7 @@ public class SettingsSliceProvider extends SliceProvider {
|
||||
try {
|
||||
KEY_VALUE_LIST_PARSER.setString(value);
|
||||
} catch (IllegalArgumentException e) {
|
||||
Log.e(TAG, "Bad Settings Slices Whitelist flags", e);
|
||||
Log.e(TAG, "Bad Settings Slices Allowlist flags", e);
|
||||
return set;
|
||||
}
|
||||
|
||||
|
@@ -45,7 +45,7 @@ public final class ContentCaptureUtils {
|
||||
|
||||
public static boolean isFeatureAvailable() {
|
||||
// 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);
|
||||
return service != null;
|
||||
}
|
||||
|
Reference in New Issue
Block a user