Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference
Bug: 161896447
Test: robotest & manual
Change-Id: I36829e0055437dab79d9e5339ac002a87a4b874f
diff --git a/src/com/android/settings/applications/appops/AppOpsState.java b/src/com/android/settings/applications/appops/AppOpsState.java
index cbffe47..eab3dda 100644
--- a/src/com/android/settings/applications/appops/AppOpsState.java
+++ b/src/com/android/settings/applications/appops/AppOpsState.java
@@ -588,7 +588,7 @@
if (appEntry == null) {
continue;
}
- List<AppOpsManager.OpEntry> dummyOps = null;
+ List<AppOpsManager.OpEntry> stubOps = null;
AppOpsManager.PackageOps pkgOps = null;
if (appInfo.requestedPermissions != null) {
for (int j=0; j<appInfo.requestedPermissions.length; j++) {
@@ -611,15 +611,15 @@
if (appEntry.hasOp(permOps.get(k))) {
continue;
}
- if (dummyOps == null) {
- dummyOps = new ArrayList<AppOpsManager.OpEntry>();
+ if (stubOps == null) {
+ stubOps = new ArrayList<AppOpsManager.OpEntry>();
pkgOps = new AppOpsManager.PackageOps(
- appInfo.packageName, appInfo.applicationInfo.uid, dummyOps);
+ appInfo.packageName, appInfo.applicationInfo.uid, stubOps);
}
AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
permOps.get(k), AppOpsManager.MODE_ALLOWED, Collections.emptyMap());
- dummyOps.add(opEntry);
+ stubOps.add(opEntry);
addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
packageName == null ? 0 : opToOrder[opEntry.getOp()]);
}
diff --git a/src/com/android/settings/backup/SettingsBackupHelper.java b/src/com/android/settings/backup/SettingsBackupHelper.java
index 92612b0..6437b78 100644
--- a/src/com/android/settings/backup/SettingsBackupHelper.java
+++ b/src/com/android/settings/backup/SettingsBackupHelper.java
@@ -59,7 +59,7 @@
try (FileOutputStream out = new FileOutputStream(newState.getFileDescriptor())) {
if (getVersionCode(oldState) != VERSION_CODE) {
- data.writeEntityHeader("dummy", 1);
+ data.writeEntityHeader("placeholder", 1);
data.writeEntityData(new byte[1], 1);
}
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index 594e553..1e0a8dd 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -142,7 +142,7 @@
@Override
protected int getPreferenceScreenResId() {
- return R.xml.dummy_preference_screen;
+ return R.xml.placeholder_preference_screen;
}
@Override
diff --git a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
index dbee443..83efcc4 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
@@ -35,7 +35,7 @@
@Override
public CharSequence getSummary() {
final DeviceNamePreferenceController deviceNamePreferenceController =
- new DeviceNamePreferenceController(mContext, "dummy_key");
+ new DeviceNamePreferenceController(mContext, "unused_key");
return deviceNamePreferenceController.getSummary();
}
}
diff --git a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
index fbaea93..73aafe5 100644
--- a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
+++ b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
@@ -37,7 +37,7 @@
@Override
public CharSequence getSummary() {
final WallpaperPreferenceController controller =
- new WallpaperPreferenceController(mContext, "dummy_key");
+ new WallpaperPreferenceController(mContext, "unused_key");
if (controller.isAvailable()) {
return mContext.getText(
controller.areStylesAvailable()
diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java
index aaee2b3..36a9734 100644
--- a/src/com/android/settings/fuelgauge/InactiveApps.java
+++ b/src/com/android/settings/fuelgauge/InactiveApps.java
@@ -77,7 +77,7 @@
super.onCreate(icicle);
mUsageStats = getActivity().getSystemService(UsageStatsManager.class);
- addPreferencesFromResource(R.xml.dummy_preference_screen);
+ addPreferencesFromResource(R.xml.placeholder_preference_screen);
getActivity().setTitle(R.string.inactive_apps_title);
}
diff --git a/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java b/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
index abbf3dc..f6b5a84 100644
--- a/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
+++ b/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
@@ -38,7 +38,7 @@
super.onCreate(savedInstanceState);
final PackageManager pm = getPackageManager();
final Intent intent = new Intent()
- .setComponent(new WallpaperPreferenceController(this, "dummy key")
+ .setComponent(new WallpaperPreferenceController(this, "unused key")
.getComponentName())
.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
index a5cc414..999e92c 100644
--- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
+++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
@@ -69,7 +69,7 @@
boolean enabled) {
final List<SearchIndexableRaw> result = new ArrayList<>();
WallpaperPreferenceController controller =
- new WallpaperPreferenceController(context, "dummy key");
+ new WallpaperPreferenceController(context, "unused key");
SearchIndexableRaw data = new SearchIndexableRaw(context);
data.title = controller.getTitle();
data.screenTitle = data.title;