Merge "Update language to comply with Android's inclusive language guidance"

res/layout/wifi_dialog.xml

@@ -335,7 +335,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"
@@ -445,7 +445,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"

src/com/android/settings/accounts/AddAccountSettings.java

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

src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java

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

src/com/android/settings/applications/manageapplications/ResetAppsHelper.java

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

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;

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));
 

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

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

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