LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android’s inclusive language guidance" am: aace0e5dad

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1381456

Change-Id: I366ebd4bbb21392bdcd9998ce8d160abbcbfe441
This commit is contained in:
Treehugger Robot
2020-07-31 16:44:08 +00:00
committed by Automerger Merge Worker
parent 46d947a2be aace0e5dad
commit 762e462fea
41 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/GestureBuilder/res/values/strings.xml
View File

@@ -40,7 +40,7 @@
<skip />
<!-- Label, prompt asking the user to enter the name of the gesture -->
<string name="prompt_gesture_name">Name</string>
<!-- Error message, informs the user he needs to enter a name before saving a gesture -->
<!-- Error message, informs the user they need to enter a name before saving a gesture -->
<string name="error_missing_name">You must enter a name</string>
<!-- success message, tells the user where the gesture was saved -->
<string name="save_success">Gesture saved in %s</string>

6
cmds/monkey/src/com/android/commands/monkey/Monkey.java
View File

@@ -178,10 +178,10 @@ public class Monkey {
/** If set, only match error if this text appears in the description text. */
private String mMatchDescription;
/** Package blacklist file. */
/** Package denylist file. */
private String mPkgBlacklistFile;
/** Package whitelist file. */
/** Package allowlist file. */
private String mPkgWhitelistFile;
/** Categories we are allowed to launch **/
@@ -966,7 +966,7 @@ public class Monkey {
}
/**
* Load package blacklist or whitelist (if specified).
* Load package denylist or allowlist (if specified).
*
* @return Returns false if any error occurs.
*/

2
samples/ApiDemos/src/com/example/android/apis/app/VoiceRecognition.java
View File

@@ -109,7 +109,7 @@ public class VoiceRecognition extends Activity implements OnClickListener {
// Specify the calling package to identify your application
intent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, getClass().getPackage().getName());
// Display an hint to the user about what he should say.
// Display an hint to the user about what they should say.
intent.putExtra(RecognizerIntent.EXTRA_PROMPT, "Speech recognition demo");
// Given an hint to the recognizer about what the user is going to say

2
samples/ApiDemos/src/com/example/android/apis/os/HeadlessSmsSendService.java
View File

@@ -21,7 +21,7 @@ import android.content.Intent;
import android.os.IBinder;
/**
* Dummy service to make sure this app can be default SMS app
* Placeholder service to make sure this app can be default SMS app
*/
public class HeadlessSmsSendService extends Service {

4
samples/MultiClientInputMethod/src/com/example/android/multiclientinputmethod/ClientCallbackImpl.java
View File

@@ -164,10 +164,10 @@ final class ClientCallbackImpl implements MultiClientInputMethodServiceDelegate.
mDelegate.setActive(mClientId, true /* active */);
}
if (inputConnection == null || editorInfo == null) {
// Dummy InputConnection case.
// Placeholder InputConnection case.
if (window.getClientId() == mClientId) {
// Special hack for temporary focus changes (e.g. notification shade).
// If we have already established a connection to this client, and if a dummy
// If we have already established a connection to this client, and if a placeholder
// InputConnection is notified, just ignore this event.
} else {
window.onDummyStartInput(mClientId, targetWindowHandle);

2
samples/RSSReader/src/com/example/android/rssreader/RssReader.java
View File

@@ -284,7 +284,7 @@ public class RssReader extends ListActivity {
mAdapter.add(mItem);
}
// NOTE: Performance idea -- would be more efficient to have he option
// NOTE: Performance idea -- would be more efficient to have the option
// to add multiple items at once, so you get less "update storm" in the UI
// compared to adding things one at a time.
}

6
samples/Snake/src/com/example/android/snake/SnakeView.java
View File

@@ -447,9 +447,9 @@ public class SnakeView extends TileView {
}
/**
* Figure out which way the snake is going, see if he's run into anything (the walls, himself,
* or an apple). If he's not going to die, we then add to the front and subtract from the rear
* in order to simulate motion. If we want to grow him, we don't subtract from the rear.
* Figure out which way the snake is going, see if they've run into anything (the walls, themself,
* or an apple). If they're not going to die, we then add to the front and subtract from the rear
* in order to simulate motion. If we want to grow them, we don't subtract from the rear.
*/
private void updateSnake() {
boolean growSnake = false;

2
samples/WeatherListWidget/src/com/example/android/weatherlistwidget/WeatherDataProvider.java
View File

@@ -30,7 +30,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.

2
samples/XmlAdapters/src/com/example/android/xmladapters/ImageDownloader.java
View File

@@ -131,7 +131,7 @@ public class ImageDownloader {
* Kept private at the moment as its interest is not clear.
*/
private void forceDownload(String url, ImageView imageView, String cookie) {
// State sanity: url is guaranteed to never be null in DownloadedDrawable and cache keys.
// State validity: url is guaranteed to never be null in DownloadedDrawable and cache keys.
if (url == null) {
imageView.setImageDrawable(null);
return;

2
samples/XmlAdapters/src/com/example/android/xmladapters/XmlDocumentProvider.java
View File

@@ -103,7 +103,7 @@ import java.util.regex.Pattern;
* <pre class="prettyprint">
* &lt;library&gt;
* &lt;book id="EH94"&gt;
* &lt;title&gt;The Old Man and the Sea&lt;/title&gt;
* &lt;title&gt;The Old Person and the Sea&lt;/title&gt;
* &lt;author&gt;Ernest Hemingway&lt;/author&gt;
* &lt;/book&gt;
* &lt;book id="XX10"&gt;

2
samples/browseable/ActionBarCompat-ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/Cheeses.java
View File

@@ -17,7 +17,7 @@
package com.example.android.actionbarcompat.listpopupmenu;
/**
* Dummy data.
* Placeholder data.
*/
public class Cheeses {
public static final String[] CHEESES = {

2
samples/browseable/ActionBarCompat-ListPopupMenu/src/com.example.android.actionbarcompat.listpopupmenu/PopupListFragment.java
View File

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

2
samples/browseable/CardEmulation/src/com.example.android.cardemulation/CardService.java
View File

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

2
samples/browseable/CustomChoiceList/src/com.example.android.customchoicelist/Cheeses.java
View File

@@ -17,7 +17,7 @@
package com.example.android.customchoicelist;
/**
* Dummy data.
* Placeholder data.
*/
public class Cheeses {
public static final String[] CHEESES = {

4
samples/browseable/DirectShare/src/com.example.android.directshare/Contact.java
View File

@@ -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"),

2
samples/browseable/DirectShare/src/com.example.android.directshare/SendMessageActivity.java
View File

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

2
samples/browseable/HorizontalPaging/src/com.example.android.horizontalpaging/MainActivity.java
View File

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

2
samples/browseable/JumpingJack/src/com.example.android.wearable.jumpingjack/MainActivity.java
View File

@@ -59,7 +59,7 @@ public class MainActivity extends Activity
private static final long TIME_THRESHOLD_NS = 2000000000; // in nanoseconds (= 2sec)
/**
* 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) > GRAVITY_THRESHOLD,
* we consider that a successful count.

2
samples/browseable/RuntimePermissions/src/com.example.android.system.runtimepermissions/MainActivity.java
View File

@@ -49,7 +49,7 @@ import common.activities.SampleActivityBase;
* 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

4
samples/browseable/RuntimePermissions/src/com.example.android.system.runtimepermissions/contacts/ContactsFragment.java
View File

@@ -40,7 +40,7 @@ import android.widget.TextView;
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
@@ -85,7 +85,7 @@ public class ContactsFragment extends Fragment implements LoaderManager.LoaderCa
mMessageText = (TextView) 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 = (Button) rootView.findViewById(R.id.contact_add);
button.setOnClickListener(new View.OnClickListener() {
@Override

2
samples/browseable/SpeedTracker/Application/src/com.example.android.wearable.speedtracker/PhoneMainActivity.java
View File

@@ -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.
*/

6
samples/browseable/StorageProvider/src/com.example.android.storageprovider/MyCloudProvider.java
View File

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

6
samples/browseable/StorageProvider/src/com.example.android.storageprovider/StorageProviderFragment.java
View File

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

2
samples/browseable/SwipeRefreshLayoutBasic/src/com.example.android.common/dummydata/Cheeses.java
View File

@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.Random;
/**
* Dummy data.
* Placeholder data.
*/
public class Cheeses {
static final String[] CHEESES = {

2
samples/browseable/SwipeRefreshLayoutBasic/src/com.example.android.swiperefreshlayoutbasic/SwipeRefreshLayoutBasicFragment.java
View File

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

2
samples/browseable/SwipeRefreshListFragment/src/com.example.android.common/dummydata/Cheeses.java
View File

@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.Random;
/**
* Dummy data.
* Placeholder data.
*/
public class Cheeses {
static final String[] CHEESES = {

2
samples/browseable/SwipeRefreshListFragment/src/com.example.android.swiperefreshlistfragment/SwipeRefreshListFragmentFragment.java
View File

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

2
samples/browseable/SwipeRefreshMultipleViews/src/com.example.android.common/dummydata/Cheeses.java
View File

@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.Random;
/**
* Dummy data.
* Placeholder data.
*/
public class Cheeses {
static final String[] CHEESES = {

2
samples/browseable/SwipeRefreshMultipleViews/src/com.example.android.swiperefreshmultipleviews/SwipeRefreshMultipleViewsFragment.java
View File

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

2
samples/browseable/WearSpeakerSample/src/com.example.android.wearable.speaker/MainActivity.java
View File

@@ -202,7 +202,7 @@ public class MainActivity extends WearableActivity implements UIAnimation.UIStat
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();

2
samples/browseable/XYZTouristAttractions/Wearable/src/com.example.android.xyztouristattractions/service/UtilityService.java
View File

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

2
samples/devbytes/animation/ListViewDraggingAnimation/src/com/example/android/listviewdragginganimation/DynamicListView.java
View File

@@ -450,7 +450,7 @@ public class DynamicListView extends ListView {
/**
* This TypeEvaluator is used to animate the BitmapDrawable back to its
* final location when the user lifts his finger by modifying the
* final location when the user lifts their finger by modifying the
* BitmapDrawable's bounds.
*/
private final static TypeEvaluator<Rect> sBoundEvaluator = new TypeEvaluator<Rect>() {

2
samples/devbytes/animation/ToonGame/src/com/example/android/toongame/ToonGame.java
View File

@@ -42,7 +42,7 @@ import android.widget.Button;
* interactive, fun, and engaging experience.
*
* This main activity launches a sub-activity when the Play button is clicked. The
* main action in this master activity is bouncing the Play button in, randomly
* main action in this manager activity is bouncing the Play button in, randomly
* bouncing it while waiting for input, and animating its press and click behaviors
* when the user interacts with it.
*

2
samples/devbytes/telephony/SmsSampleProject/app/src/main/java/com/example/android/smssample/MainActivity.java
View File

@@ -101,7 +101,7 @@ public class MainActivity extends FragmentActivity implements LoaderCallbacks<Cu
}
/**
* Dummy sendSms method, would need the "to" address to actually send a message :)
* Placeholder sendSms method, would need the "to" address to actually send a message :)
*/
private void sendSms(String smsText) {
if (!TextUtils.isEmpty(smsText)) {

2
samples/training/AnimationsDemo/res/layout/excerpt_content.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- Dummy content. -->
<!-- Placeholder content. -->
<TextView style="?android:textAppearanceMedium"
android:lineSpacingMultiplier="1.2"
android:layout_width="match_parent"

2
samples/training/AnimationsDemo/res/layout/fragment_screen_slide_page.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- Dummy content. -->
<!-- Placeholder content. -->
<LinearLayout android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"

2
samples/training/AnimationsDemo/res/layout/list_item_example.xml
View File

@@ -23,7 +23,7 @@
android:dividerPadding="8dp"
android:gravity="center">
<!-- Dummy text view that will display the name of a random country. -->
<!-- Placeholder text view that will display the name of a random country. -->
<TextView android:id="@android:id/text1"
style="?android:textAppearanceMedium"
android:layout_width="0dp"

4
samples/training/AnimationsDemo/src/com/example/android/animationsdemo/ScreenSlidePageFragment.java
View File

@@ -24,8 +24,8 @@ import android.view.ViewGroup;
import android.widget.TextView;
/**
* A fragment representing a single step in a wizard. The fragment shows a dummy title indicating
* the page number, along with some dummy text.
* A fragment representing a single step in a wizard. The fragment shows a placeholder title indicating
* the page number, along with some placeholder text.
*
* <p>This class is used by the {@link CardFlipActivity} and {@link
* ScreenSlideActivity} samples.</p>

2
samples/training/EffectiveNavigation/src/com/example/android/effectivenavigation/CollectionDemoActivity.java
View File

@@ -129,7 +129,7 @@ public class CollectionDemoActivity extends FragmentActivity {
}
/**
* 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 {

4
samples/training/EffectiveNavigation/src/com/example/android/effectivenavigation/MainActivity.java
View File

@@ -123,7 +123,7 @@ public class MainActivity extends FragmentActivity implements ActionBar.TabListe
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);
@@ -185,7 +185,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.
*/
public static class DummySectionFragment extends Fragment {

2
samples/training/TabCompat/src/com/example/android/tabcompat/lib/TabHelperEclair.java
View File

@@ -35,7 +35,7 @@ import java.util.HashMap;
* It implements a generic mechanism for associating fragments with the tabs in a tab host. It
* relies on a trick: Normally a tab host has a simple API for supplying a View or Intent that each
* tab will show. This is not sufficient for switching between fragments. So instead we make the
* content part of the tab host 0dp high (it is not shown) and this supplies its own dummy view to
* content part of the tab host 0dp high (it is not shown) and this supplies its own placeholder view to
* show as the tab content. It listens to changes in tabs, then passes the event back to the tab's
* callback interface so the activity can take care of switching to the correct fragment.
*/