Merge "Update language to comply with Android’s inclusive language guidance" am: 0bb33ab010 am: 27b367fd26 am: 79609bfa75 am: 457aacb7a5 am: 37a86c16ff
Original change: https://android-review.googlesource.com/c/platform/developers/build/+/1374754
Change-Id: I4c54f0c9d9ea4e953e959b2c6db455987edab279
diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/AndroidManifest.xml b/prebuilts/androidtv/sample-inputs/app/src/main/AndroidManifest.xml
index 14ad57e..04da968 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/AndroidManifest.xml
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/AndroidManifest.xml
@@ -101,9 +101,9 @@
android:resource="@xml/syncadapter" />
</service>
- <!-- Since the channel/program feed here does not require any authentication, we use a dummy
+ <!-- Since the channel/program feed here does not require any authentication, we use a stub
account used for SyncAdapter. -->
- <service android:name=".syncadapter.DummyAccountService">
+ <service android:name=".syncadapter.StubAccountService">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator" />
</intent-filter>
diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java
index a306e5e..726c459 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/rich/RichSetupFragment.java
@@ -46,7 +46,7 @@
import com.example.android.sampletvinput.TvContractUtils;
import com.example.android.sampletvinput.rich.RichTvInputService.ChannelInfo;
import com.example.android.sampletvinput.rich.RichTvInputService.TvInput;
-import com.example.android.sampletvinput.syncadapter.DummyAccountService;
+import com.example.android.sampletvinput.syncadapter.StubAccountService;
import com.example.android.sampletvinput.syncadapter.SyncUtils;
import com.squareup.picasso.Picasso;
import com.squareup.picasso.Target;
@@ -238,7 +238,7 @@
if (mFinished) {
return;
}
- Account account = DummyAccountService.getAccount(SyncUtils.ACCOUNT_TYPE);
+ Account account = StubAccountService.getAccount(SyncUtils.ACCOUNT_TYPE);
boolean syncActive = ContentResolver.isSyncActive(account,
TvContract.AUTHORITY);
boolean syncPending = ContentResolver.isSyncPending(account,
diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/DummyAccountService.java b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/StubAccountService.java
similarity index 83%
rename from prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/DummyAccountService.java
rename to prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/StubAccountService.java
index 8f7c6f0..93f5270 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/DummyAccountService.java
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/StubAccountService.java
@@ -28,13 +28,13 @@
/**
- * Dummy account service for SyncAdapter. Note that this does nothing because this input uses a feed
+ * Stub account service for SyncAdapter. Note that this does nothing because this input uses a feed
* which does not require any authentication.
*/
-public class DummyAccountService extends Service {
- private static final String TAG = "DummyAccountService";
- private DummyAuthenticator mAuthenticator;
- public static final String ACCOUNT_NAME = "DummyAccount";
+public class StubAccountService extends Service {
+ private static final String TAG = "StubAccountService";
+ private StubAuthenticator mAuthenticator;
+ public static final String ACCOUNT_NAME = "StubAccount";
public static Account getAccount(String accountType) {
return new Account(ACCOUNT_NAME, accountType);
@@ -42,7 +42,7 @@
@Override
public void onCreate() {
- mAuthenticator = new DummyAuthenticator(this);
+ mAuthenticator = new StubAuthenticator(this);
}
@Override
@@ -51,11 +51,11 @@
}
/**
- * Dummy Authenticator used in {@link SyncAdapter}. This does nothing for all the operations
+ * Stub Authenticator used in {@link SyncAdapter}. This does nothing for all the operations
* since channel/program feed does not require any authentication.
*/
- public class DummyAuthenticator extends AbstractAccountAuthenticator {
- public DummyAuthenticator(Context context) {
+ public class StubAuthenticator extends AbstractAccountAuthenticator {
+ public StubAuthenticator(Context context) {
super(context);
}
diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/SyncUtils.java b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/SyncUtils.java
index 0cd33b8..d582fa1 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/SyncUtils.java
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/syncadapter/SyncUtils.java
@@ -33,7 +33,7 @@
public static final String ACCOUNT_TYPE = "com.example.android.sampletvinput.account";
public static void setUpPeriodicSync(Context context, String inputId) {
- Account account = DummyAccountService.getAccount(ACCOUNT_TYPE);
+ Account account = StubAccountService.getAccount(ACCOUNT_TYPE);
AccountManager accountManager =
(AccountManager) context.getSystemService(Context.ACCOUNT_SERVICE);
if (!accountManager.addAccountExplicitly(account, null, null)) {
@@ -52,7 +52,7 @@
bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
bundle.putBoolean(ContentResolver.SYNC_EXTRAS_EXPEDITED, true);
bundle.putString(SyncAdapter.BUNDLE_KEY_INPUT_ID, inputId);
- ContentResolver.requestSync(DummyAccountService.getAccount(ACCOUNT_TYPE), CONTENT_AUTHORITY,
+ ContentResolver.requestSync(StubAccountService.getAccount(ACCOUNT_TYPE), CONTENT_AUTHORITY,
bundle);
}
}
