Merge "Update language to comply with Android's inclusive language guidance" am: b590b3f07f am: a6f5cae4ce am: 5403d40570 am: 37708888fb

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1381457

Change-Id: I1bc84cceae8eebec2e41485446c75feaa89ec46d

35 files changed, 46 insertions, 46 deletions

diff --git a/common/src/java/com/example/android/common/dummydata/Cheeses.java b/common/src/java/com/example/android/common/dummydata/Cheeses.java
index 783735ce..3b7fcefe 100644
--- a/common/src/java/com/example/android/common/dummydata/Cheeses.java
+++ b/common/src/java/com/example/android/common/dummydata/Cheeses.java
@@ -21,7 +21,7 @@ import java.util.HashSet;
 import java.util.Random;
 
 /**
- * Dummy data.
+ * Placeholder data.
  */
 public class Cheeses {
     static final String[] CHEESES = {
diff --git a/connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java b/connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java
index a409d28f..123785ed 100644
--- a/connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java
+++ b/connectivity/nfc/CardEmulation/Application/src/main/java/com/example/android/cardemulation/CardService.java
@@ -65,7 +65,7 @@ public class CardService extends HostApduService {
      * This method will be called when a command APDU has been received from a remote device. A
      * response APDU can be provided directly by returning a byte-array in this method. In general
      * response APDUs must be sent as quickly as possible, given the fact that the user is likely
-     * holding his device over an NFC reader when this method is called.
+     * holding their device over an NFC reader when this method is called.
      *
      * <p class="note">If there are multiple services that have registered for the same AIDs in
      * their meta-data entry, you will only get called if the user has explicitly selected your
diff --git a/content/DirectShare/Application/src/main/java/com/example/android/directshare/Contact.java b/content/DirectShare/Application/src/main/java/com/example/android/directshare/Contact.java
index 4a1665e3..9e234768 100644
--- a/content/DirectShare/Application/src/main/java/com/example/android/directshare/Contact.java
+++ b/content/DirectShare/Application/src/main/java/com/example/android/directshare/Contact.java
@@ -17,13 +17,13 @@
 package com.example.android.directshare;
 
 /**
- * Provides the list of dummy contacts. This sample implements this as constants, but real-life apps
+ * Provides the list of placeholder contacts. This sample implements this as constants, but real-life apps
  * should use a database and such.
  */
 public class Contact {
 
     /**
-     * The list of dummy contacts.
+     * The list of placeholder contacts.
      */
     public static final Contact[] CONTACTS = {
             new Contact("Tereasa"),
diff --git a/content/DirectShare/Application/src/main/java/com/example/android/directshare/SendMessageActivity.java b/content/DirectShare/Application/src/main/java/com/example/android/directshare/SendMessageActivity.java
index d291172e..39826d4f 100644
--- a/content/DirectShare/Application/src/main/java/com/example/android/directshare/SendMessageActivity.java
+++ b/content/DirectShare/Application/src/main/java/com/example/android/directshare/SendMessageActivity.java
@@ -141,7 +141,7 @@ public class SendMessageActivity extends Activity {
     };
 
     /**
-     * Pretends to send the text to the contact. This only shows a dummy message.
+     * Pretends to send the text to the contact. This only shows a placeholder message.
      */
     private void send() {
         Toast.makeText(this,
diff --git a/content/SharingShortcuts/Application/src/main/java/com/example/android/sharingshortcuts/Contact.java b/content/SharingShortcuts/Application/src/main/java/com/example/android/sharingshortcuts/Contact.java
index 155a8412..e5f25b32 100644
--- a/content/SharingShortcuts/Application/src/main/java/com/example/android/sharingshortcuts/Contact.java
+++ b/content/SharingShortcuts/Application/src/main/java/com/example/android/sharingshortcuts/Contact.java
@@ -19,13 +19,13 @@ package com.example.android.sharingshortcuts;
 import androidx.annotation.NonNull;
 
 /**
- * Provides the list of dummy contacts. This sample implements this as constants, but real-life apps
+ * Provides the list of placeholder contacts. This sample implements this as constants, but real-life apps
  * should use a database and such.
  */
 public class Contact {
 
     /**
-     * The list of dummy contacts.
+     * The list of placeholder contacts.
      */
     public static final Contact[] CONTACTS = {
             new Contact("Tereasa"),
diff --git a/content/SharingShortcuts/Application/src/main/java/com/example/android/sharingshortcuts/SendMessageActivity.java b/content/SharingShortcuts/Application/src/main/java/com/example/android/sharingshortcuts/SendMessageActivity.java
index 7519a7b8..86ac18d9 100644
--- a/content/SharingShortcuts/Application/src/main/java/com/example/android/sharingshortcuts/SendMessageActivity.java
+++ b/content/SharingShortcuts/Application/src/main/java/com/example/android/sharingshortcuts/SendMessageActivity.java
@@ -150,7 +150,7 @@ public class SendMessageActivity extends Activity {
     };
 
     /**
-     * Pretends to send the text to the contact. This only shows a dummy message.
+     * Pretends to send the text to the contact. This only shows a placeholder message.
      */
     private void send() {
         Toast.makeText(this,
diff --git a/content/WidgetData/Application/src/main/java/com/example/android/widgetdata/WeatherDataProvider.java b/content/WidgetData/Application/src/main/java/com/example/android/widgetdata/WeatherDataProvider.java
index 2508f014..d1f44a4c 100644
--- a/content/WidgetData/Application/src/main/java/com/example/android/widgetdata/WeatherDataProvider.java
+++ b/content/WidgetData/Application/src/main/java/com/example/android/widgetdata/WeatherDataProvider.java
@@ -25,7 +25,7 @@ import android.net.Uri;
 import java.util.ArrayList;
 
 /**
- * A dummy class that we are going to use internally to store weather data.  Generally, this data
+ * A placeholder class that we are going to use internally to store weather data.  Generally, this data
  * will be stored in an external and persistent location (ie. File, Database, SharedPreferences) so
  * that the data can persist if the process is ever killed.  For simplicity, in this sample the
  * data will only be stored in memory.
diff --git a/content/WidgetData/Application/src/main/java/com/example/android/widgetdata/WidgetDataFragment.java b/content/WidgetData/Application/src/main/java/com/example/android/widgetdata/WidgetDataFragment.java
index b7500a98..5bc990fd 100644
--- a/content/WidgetData/Application/src/main/java/com/example/android/widgetdata/WidgetDataFragment.java
+++ b/content/WidgetData/Application/src/main/java/com/example/android/widgetdata/WidgetDataFragment.java
@@ -8,7 +8,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 /**
- * A Dummy Fragment that shows the intro text from a layout.
+ * A Placeholder Fragment that shows the intro text from a layout.
  */
 public class WidgetDataFragment extends Fragment {
 
diff --git a/content/documentsUi/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java b/content/documentsUi/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java
index 11c52274..6b7c4012 100644
--- a/content/documentsUi/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java
+++ b/content/documentsUi/ContentProviderPaging/app/src/main/java/com/example/android/contentproviderpaging/ImageProvider.java
@@ -57,7 +57,7 @@ public class ImageProvider extends ContentProvider {
         sUriMatcher.addURI(ImageContract.AUTHORITY, "images/#", IMAGE_ID);
     }
 
-    // Indicated how many same images are going to be written as dummy images
+    // Indicated how many same images are going to be written as placeholder images
     private static final int REPEAT_COUNT_WRITE_FILES = 10;
 
     private File mBaseDir;
@@ -185,7 +185,7 @@ public class ImageProvider extends ContentProvider {
 
     /**
      * Preload sample files packaged in the apk into the internal storage directory.  This is a
-     * dummy function specific to this demo.  The MyCloud mock cloud service doesn't actually
+     * placeholder function specific to this demo.  The MyCloud mock cloud service doesn't actually
      * have a backend, so it simulates by reading content from the device's internal storage.
      */
     private void writeDummyFilesToStorage(Context context) {
@@ -202,7 +202,7 @@ public class ImageProvider extends ContentProvider {
     }
 
     /**
-     * Write a file to internal storage.  Used to set up our dummy "cloud server".
+     * Write a file to internal storage.  Used to set up our placeholder "cloud server".
      *
      * @param context   the Context
      * @param resId     the resource ID of the file to write to internal storage
diff --git a/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java b/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
index 9f9249a3..d76bd675 100644
--- a/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
+++ b/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/MyCloudProvider.java
@@ -545,7 +545,7 @@ public class MyCloudProvider extends DocumentsProvider {
 
     /**
      * Preload sample files packaged in the apk into the internal storage directory.  This is a
-     * dummy function specific to this demo.  The MyCloud mock cloud service doesn't actually
+     * placeholder function specific to this demo.  The MyCloud mock cloud service doesn't actually
      * have a backend, so it simulates by reading content from the device's internal storage.
      */
     private void writeDummyFilesToStorage() {
@@ -570,7 +570,7 @@ public class MyCloudProvider extends DocumentsProvider {
     }
 
     /**
-     * Write a file to internal storage.  Used to set up our dummy "cloud server".
+     * Write a file to internal storage.  Used to set up our placeholder "cloud server".
      *
      * @param resId     the resource ID of the file to write to internal storage
      * @param extension the file extension (ex. .png, .mp3)
@@ -608,7 +608,7 @@ public class MyCloudProvider extends DocumentsProvider {
     }
 
     /**
-     * Dummy function to determine whether the user is logged in.
+     * Placeholder function to determine whether the user is logged in.
      */
     private boolean isUserLoggedIn() {
         final SharedPreferences sharedPreferences =
diff --git a/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/StorageProviderFragment.java b/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/StorageProviderFragment.java
index 80d0296d..ace02429 100644
--- a/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/StorageProviderFragment.java
+++ b/content/documentsUi/StorageProvider/Application/src/main/java/com/example/android/storageprovider/StorageProviderFragment.java
@@ -70,7 +70,7 @@ public class StorageProviderFragment extends Fragment {
     }
 
     /**
-     * Dummy function to change the user's authorization status.
+     * Placeholder function to change the user's authorization status.
      */
     private void toggleLogin() {
         // Replace this with your standard method of authentication to determine if your app
@@ -81,7 +81,7 @@ public class StorageProviderFragment extends Fragment {
     }
 
     /**
-     * Dummy function to save whether the user is logged in.
+     * Placeholder function to save whether the user is logged in.
      */
     private void writeLoginValue(boolean loggedIn) {
         final SharedPreferences sharedPreferences =
@@ -91,7 +91,7 @@ public class StorageProviderFragment extends Fragment {
     }
 
     /**
-     * Dummy function to determine whether the user is logged in.
+     * Placeholder function to determine whether the user is logged in.
      */
     private boolean readLoginValue() {
         final SharedPreferences sharedPreferences =
diff --git a/deprecated/wearable/wear/WearMessagingApp/Wearable/src/main/java/com/example/android/wearable/wear/messaging/mock/MockDatabase.java b/deprecated/wearable/wear/WearMessagingApp/Wearable/src/main/java/com/example/android/wearable/wear/messaging/mock/MockDatabase.java
index c3526701..5310044e 100644
--- a/deprecated/wearable/wear/WearMessagingApp/Wearable/src/main/java/com/example/android/wearable/wear/messaging/mock/MockDatabase.java
+++ b/deprecated/wearable/wear/WearMessagingApp/Wearable/src/main/java/com/example/android/wearable/wear/messaging/mock/MockDatabase.java
@@ -224,7 +224,7 @@ public class MockDatabase {
     }
 
     /**
-     * Generates a set of predefined dummy contacts. You may need to add in extra logic for
+     * Generates a set of predefined placeholder contacts. You may need to add in extra logic for
      * timestamp changes between server and local app.
      *
      * @return a list of profiles to be used as contacts
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/BadViewStructureCreationSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/BadViewStructureCreationSignInActivity.java
index ddc57988..1210c3ac 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/BadViewStructureCreationSignInActivity.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/BadViewStructureCreationSignInActivity.java
@@ -93,7 +93,7 @@ public class BadViewStructureCreationSignInActivity extends AppCompatActivity {
     }
 
     /**
-     * Dummy implementation for demo purposes. A real service should use secure mechanisms to
+     * Placeholder implementation for demo purposes. A real service should use secure mechanisms to
      * authenticate users.
      */
     public boolean isValidCredentials(String username, String password) {
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/CallbackLessAutoCompleteSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/CallbackLessAutoCompleteSignInActivity.java
index 9f28912f..583e1e27 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/CallbackLessAutoCompleteSignInActivity.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/antipatterns/CallbackLessAutoCompleteSignInActivity.java
@@ -100,7 +100,7 @@ public class CallbackLessAutoCompleteSignInActivity extends AppCompatActivity {
     }
 
     /**
-     * Dummy implementation for demo purposes. A real service should use secure mechanisms to
+     * Placeholder implementation for demo purposes. A real service should use secure mechanisms to
      * authenticate users.
      */
     public boolean isValidCredentials(String username, String password) {
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java
index 089c6b2d..30991be4 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardAutoCompleteSignInActivity.java
@@ -110,7 +110,7 @@ public class StandardAutoCompleteSignInActivity extends AppCompatActivity {
     }
 
     /**
-     * Dummy implementation for demo purposes. A real service should use secure mechanisms to
+     * Placeholder implementation for demo purposes. A real service should use secure mechanisms to
      * authenticate users.
      */
     public boolean isValidCredentials(String username, String password) {
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java
index 3e3b5e9f..48b9522f 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/StandardSignInActivity.java
@@ -83,7 +83,7 @@ public class StandardSignInActivity extends AppCompatActivity {
     }
 
     /**
-     * Dummy implementation for demo purposes. A real service should use secure mechanisms to
+     * Placeholder implementation for demo purposes. A real service should use secure mechanisms to
      * authenticate users.
      */
     public boolean isValidCredentials(String username, String password) {
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/VirtualSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/VirtualSignInActivity.java
index baafbf75..0c31a45d 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/VirtualSignInActivity.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/commoncases/VirtualSignInActivity.java
@@ -93,7 +93,7 @@ public class VirtualSignInActivity extends AppCompatActivity {
     }
 
     /**
-     * Dummy implementation for demo purposes. A real service should use secure mechanisms to
+     * Placeholder implementation for demo purposes. A real service should use secure mechanisms to
      * authenticate users.
      */
     public boolean isValidCredentials(String username, String password) {
diff --git a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/VirtualCompatModeSignInActivity.java b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/VirtualCompatModeSignInActivity.java
index d55db82d..eba4864a 100644
--- a/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/VirtualCompatModeSignInActivity.java
+++ b/input/autofill/AutofillFramework/Application/src/main/java/com/example/android/autofill/app/edgecases/VirtualCompatModeSignInActivity.java
@@ -38,7 +38,7 @@ import com.example.android.autofill.app.view.autofillable.CustomVirtualViewCompa
 
  * <p>Useful to test an Autofill service that supports Compatibility Mode.
  *
- * <p><b>Note: </b>you must whitelist this app's package for compatibility mode. For exmaple, in
+ * <p><b>Note: </b>you must allowlist this app's package for compatibility mode. For exmaple, in
  * a UNIX-like OS such as Linux, you can run:
  *
  * <pre>
@@ -111,7 +111,7 @@ public class VirtualCompatModeSignInActivity extends AppCompatActivity {
     }
 
     /**
-     * Dummy implementation for demo purposes. A real service should use secure mechanisms to
+     * Placeholder implementation for demo purposes. A real service should use secure mechanisms to
      * authenticate users.
      */
     public boolean isValidCredentials(String username, String password) {
diff --git a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AutofillHintProperties.java b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AutofillHintProperties.java
index 8314eb30..3da54c1d 100644
--- a/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AutofillHintProperties.java
+++ b/input/autofill/AutofillFramework/afservice/src/main/java/com/example/android/autofill/service/AutofillHintProperties.java
@@ -44,7 +44,7 @@ public final class AutofillHintProperties {
     }
 
     /**
-     * Generates dummy autofill field data that is relevant to the autofill hint.
+     * Generates placeholder autofill field data that is relevant to the autofill hint.
      */
     public FilledAutofillField generateFakeField(int seed, String datasetId) {
         return mFakeFieldGenerator.generate(seed, datasetId);
diff --git a/notification/Bubbles/app/src/main/AndroidManifest.xml b/notification/Bubbles/app/src/main/AndroidManifest.xml
index 45fac5e7..8c20eaa3 100644
--- a/notification/Bubbles/app/src/main/AndroidManifest.xml
+++ b/notification/Bubbles/app/src/main/AndroidManifest.xml
@@ -55,7 +55,7 @@
         </activity>
 
         <!--
-            The dummy voice-call screen.
+            The placeholder voice-call screen.
             This Activity can be launched from inside an expanded Bubble. Since this Activity is launched as a new task,
             it is opened as a full Activity, rather than stacked inside the expanded Bubble.
         -->
diff --git a/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java b/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java
index 37db139d..8b417df4 100644
--- a/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java
+++ b/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/MainActivity.java
@@ -42,7 +42,7 @@ import com.example.android.system.runtimepermissions.contacts.ContactsFragment;
  * Contacts permissions (({@link android.Manifest.permission#READ_CONTACTS} and ({@link
  * android.Manifest.permission#WRITE_CONTACTS})) are requested when the 'Show and Add Contacts'
  * button is
- * clicked to display the first contact in the contacts database and to add a dummy contact
+ * clicked to display the first contact in the contacts database and to add a placeholder contact
  * directly to it. Permissions are verified and requested through compat helpers in the support v4
  * library, in this Activity using {@link ActivityCompat}.
  * First, permissions are checked if they have already been granted through {@link
diff --git a/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/contacts/ContactsFragment.java b/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/contacts/ContactsFragment.java
index e6440f09..19675907 100644
--- a/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/contacts/ContactsFragment.java
+++ b/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/contacts/ContactsFragment.java
@@ -40,7 +40,7 @@ import com.example.android.system.runtimepermissions.R;
 import java.util.ArrayList;
 
 /**
- * Displays the first contact stored on the device and contains an option to add a dummy contact.
+ * Displays the first contact stored on the device and contains an option to add a placeholder contact.
  * <p>
  * This Fragment is only used to illustrate that access to the Contacts ContentProvider API has
  * been granted (or denied) as part of the runtime permissions model. It is not relevant for the
@@ -83,7 +83,7 @@ public class ContactsFragment extends Fragment implements LoaderManager.LoaderCa
 
         mMessageText = rootView.findViewById(R.id.contact_message);
 
-        // Register a listener to add a dummy contact when a button is clicked.
+        // Register a listener to add a placeholder contact when a button is clicked.
         Button button = rootView.findViewById(R.id.contact_add);
         button.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
index 5ef11616..8830b48d 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
+++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/Cheeses.java
@@ -17,7 +17,7 @@
 package com.example.android.actionbarcompat.listpopupmenu;
 
 /**
- * Dummy data.
+ * Placeholder data.
  */
 public class Cheeses {
     public static final String[] CHEESES = {
diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
index 754bf224..862763b5 100644
--- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
+++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/src/main/java/com/example/android/actionbarcompat/listpopupmenu/PopupListFragment.java
@@ -38,7 +38,7 @@ public class PopupListFragment extends ListFragment implements View.OnClickListe
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        // We want to allow modifications to the list so copy the dummy data array into an ArrayList
+        // We want to allow modifications to the list so copy the placeholder data array into an ArrayList
         ArrayList<String> items = new ArrayList<String>();
         for (int i = 0, z = Cheeses.CHEESES.length ; i < z ; i++) {
             items.add(Cheeses.CHEESES[i]);
diff --git a/ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java b/ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java
index 871ae292..21b3f6bd 100644
--- a/ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java
+++ b/ui/lists/CustomChoiceList/Application/src/main/java/com/example/android/customchoicelist/Cheeses.java
@@ -17,7 +17,7 @@
 package com.example.android.customchoicelist;
 
 /**
- * Dummy data.
+ * Placeholder data.
  */
 public class Cheeses {
     public static final String[] CHEESES = {
diff --git a/ui/views/EffectiveNavigation/app/src/main/java/com/example/android/effectivenavigation/CollectionDemoActivity.java b/ui/views/EffectiveNavigation/app/src/main/java/com/example/android/effectivenavigation/CollectionDemoActivity.java
index 3f5ebdc1..38ac6b87 100644
--- a/ui/views/EffectiveNavigation/app/src/main/java/com/example/android/effectivenavigation/CollectionDemoActivity.java
+++ b/ui/views/EffectiveNavigation/app/src/main/java/com/example/android/effectivenavigation/CollectionDemoActivity.java
@@ -98,7 +98,7 @@ public class CollectionDemoActivity extends AppCompatActivity {
     }
 
     /**
-     * A dummy fragment representing a section of the app, but that simply displays dummy text.
+     * A placeholder fragment representing a section of the app, but that simply displays placeholder text.
      */
     public static class DemoObjectFragment extends Fragment {
 
diff --git a/ui/views/EffectiveNavigation/app/src/main/java/com/example/android/effectivenavigation/MainActivity.java b/ui/views/EffectiveNavigation/app/src/main/java/com/example/android/effectivenavigation/MainActivity.java
index 5efc2371..0fce99e4 100644
--- a/ui/views/EffectiveNavigation/app/src/main/java/com/example/android/effectivenavigation/MainActivity.java
+++ b/ui/views/EffectiveNavigation/app/src/main/java/com/example/android/effectivenavigation/MainActivity.java
@@ -92,7 +92,7 @@ public class MainActivity extends AppCompatActivity {
                     return new LaunchpadSectionFragment();
 
                 default:
-                    // The other sections of the app are dummy placeholders.
+                    // The other sections of the app are placeholder placeholders.
                     Fragment fragment = new DummySectionFragment();
                     Bundle args = new Bundle();
                     args.putInt(DummySectionFragment.ARG_SECTION_NUMBER, i + 1);
@@ -156,7 +156,7 @@ public class MainActivity extends AppCompatActivity {
     }
 
     /**
-     * A dummy fragment representing a section of the app, but that simply displays dummy text.
+     * A placeholder fragment representing a section of the app, but that simply displays placeholder text.
      */
     public static class DummySectionFragment extends Fragment {
 
diff --git a/ui/views/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java b/ui/views/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java
index fdd4495f..3a12ba32 100644
--- a/ui/views/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java
+++ b/ui/views/HorizontalPaging/Application/src/main/java/com/example/android/horizontalpaging/MainActivity.java
@@ -193,7 +193,7 @@ public class MainActivity extends FragmentActivity implements ActionBar.TabListe
     }
 
     /**
-     * A dummy fragment representing a section of the app, but that simply displays dummy text.
+     * A placeholder fragment representing a section of the app, but that simply displays placeholder text.
      * This would be replaced with your application's content.
      */
     public static class DummySectionFragment extends Fragment {
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
index 13b22f5c..69133588 100644
--- a/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
+++ b/ui/views/SwipeRefreshLayout/SwipeRefreshLayoutBasic/Application/src/main/java/com/example/android/swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
@@ -203,7 +203,7 @@ public class SwipeRefreshLayoutBasicFragment extends Fragment {
     // END_INCLUDE (refresh_complete)
 
     /**
-     * Dummy {@link AsyncTask} which simulates a long running task to fetch new cheeses.
+     * Placeholder {@link AsyncTask} which simulates a long running task to fetch new cheeses.
      */
     private class DummyBackgroundTask extends AsyncTask<Void, Void, List<String>> {
 
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
index 1147ea81..900ed663 100644
--- a/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
+++ b/ui/views/SwipeRefreshLayout/SwipeRefreshListFragment/Application/src/main/java/com/example/android/swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
@@ -200,7 +200,7 @@ public class SwipeRefreshListFragmentFragment extends SwipeRefreshListFragment {
     // END_INCLUDE (refresh_complete)
 
     /**
-     * Dummy {@link AsyncTask} which simulates a long running task to fetch new cheeses.
+     * Placeholder {@link AsyncTask} which simulates a long running task to fetch new cheeses.
      */
     private class DummyBackgroundTask extends AsyncTask<Void, Void, List<String>> {
 
diff --git a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
index 7bb29c84..d470d376 100644
--- a/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
+++ b/ui/views/SwipeRefreshLayout/SwipeRefreshMultipleViews/Application/src/main/java/com/example/android/swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
@@ -220,7 +220,7 @@ public class SwipeRefreshMultipleViewsFragment extends Fragment {
     // END_INCLUDE (refresh_complete)
 
     /**
-     * Dummy {@link AsyncTask} which simulates a long running task to fetch new cheeses.
+     * Placeholder {@link AsyncTask} which simulates a long running task to fetch new cheeses.
      */
     private class DummyBackgroundTask extends AsyncTask<Void, Void, List<String>> {
 
diff --git a/wearable/wear/JumpingJack/Wearable/src/main/java/com/example/android/wearable/jumpingjack/MainActivity.java b/wearable/wear/JumpingJack/Wearable/src/main/java/com/example/android/wearable/jumpingjack/MainActivity.java
index f344cfee..ca6f3f05 100644
--- a/wearable/wear/JumpingJack/Wearable/src/main/java/com/example/android/wearable/jumpingjack/MainActivity.java
+++ b/wearable/wear/JumpingJack/Wearable/src/main/java/com/example/android/wearable/jumpingjack/MainActivity.java
@@ -52,7 +52,7 @@ public class MainActivity extends FragmentActivity
     private static final long TIME_THRESHOLD_NS = TimeUnit.SECONDS.toNanos(2);
 
     /**
-     * Earth gravity is around 9.8 m/s^2 but user may not completely direct his/her hand vertical
+     * Earth gravity is around 9.8 m/s^2 but user may not completely direct their hand vertical
      * during the exercise so we leave some room. Basically, if the x-component of gravity, as
      * measured by the Gravity sensor, changes with a variation delta > 0.03 from the hand down
      * and hand up threshold we define below, we consider that a successful count.
diff --git a/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java b/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java
index 4f9ea723..db86fb3b 100644
--- a/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java
+++ b/wearable/wear/SpeedTracker/Application/src/main/java/com/example/android/wearable/speedtracker/PhoneMainActivity.java
@@ -42,7 +42,7 @@ import java.util.List;
 
 /**
  * The main activity for the handset application. When a watch device reconnects to the handset
- * app, the collected GPS data on the watch, if any, is synced up and user can see his/her track on
+ * app, the collected GPS data on the watch, if any, is synced up and user can see their track on
  * a map. This data is then saved into an internal database and the corresponding data items are
  * deleted.
  */
diff --git a/wearable/wear/WearSpeakerSample/wear/src/main/java/com/example/android/wearable/speaker/MainActivity.java b/wearable/wear/WearSpeakerSample/wear/src/main/java/com/example/android/wearable/speaker/MainActivity.java
index defe9d16..44ccc536 100644
--- a/wearable/wear/WearSpeakerSample/wear/src/main/java/com/example/android/wearable/speaker/MainActivity.java
+++ b/wearable/wear/WearSpeakerSample/wear/src/main/java/com/example/android/wearable/speaker/MainActivity.java
@@ -223,7 +223,7 @@ public class MainActivity extends FragmentActivity implements
                 start();
             } else {
                 // Permission has been denied before. At this point we should show a dialog to
-                // user and explain why this permission is needed and direct him to go to the
+                // user and explain why this permission is needed and direct them to go to the
                 // Permissions settings for the app in the System settings. For this sample, we
                 // simply exit to get to the important part.
                 Toast.makeText(this, R.string.exiting_for_permissions, Toast.LENGTH_LONG).show();
diff --git a/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java b/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
index 8a4fea56..1a30dd5e 100644
--- a/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
+++ b/wearable/wear/XYZTouristAttractions/Wearable/src/main/java/com/example/android/xyztouristattractions/service/UtilityService.java
@@ -67,7 +67,7 @@ public class UtilityService extends IntentService {
     }
 
     /**
-     * Trigger a message that asks the master device to start an activity.
+     * Trigger a message that asks the manager device to start an activity.
      *
      * @param context the context
      * @param path the path that will be sent via the wearable message API