diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml index 45ecd610e7e..12254eb5550 100644 --- a/res/layout/wifi_dialog.xml +++ b/res/layout/wifi_dialog.xml @@ -329,7 +329,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/wifi_item" > - + - + apps = mPm.getInstalledApplications( PackageManager.GET_DISABLED_COMPONENTS); - final List whiteList = Arrays.asList( + final List 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 { diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java index 3ad879a279a..900ec7aa710 100644 --- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java @@ -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; diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java index ec06858541c..ef406ff3703 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java @@ -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)); diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index ebc493967e4..ab45e2af1b9 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -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, 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 diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java index 02a1dbc5306..9a2f525eb0b 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java @@ -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 diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index c22d001a2d8..0707d06b93c 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -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; } diff --git a/src/com/android/settings/utils/ContentCaptureUtils.java b/src/com/android/settings/utils/ContentCaptureUtils.java index a92651fbb48..b01749f0c5e 100644 --- a/src/com/android/settings/utils/ContentCaptureUtils.java +++ b/src/com/android/settings/utils/ContentCaptureUtils.java @@ -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; }