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
This commit is contained in:
@@ -588,7 +588,7 @@ public class AppOpsState {
|
||||
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 @@ public class AppOpsState {
|
||||
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()]);
|
||||
}
|
||||
|
@@ -59,7 +59,7 @@ public class SettingsBackupHelper extends BackupAgentHelper {
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
@@ -142,7 +142,7 @@ public abstract class ProfileSelectFragment extends DashboardFragment {
|
||||
|
||||
@Override
|
||||
protected int getPreferenceScreenResId() {
|
||||
return R.xml.dummy_preference_screen;
|
||||
return R.xml.placeholder_preference_screen;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@@ -35,7 +35,7 @@ public class TopLevelAboutDevicePreferenceController extends BasePreferenceContr
|
||||
@Override
|
||||
public CharSequence getSummary() {
|
||||
final DeviceNamePreferenceController deviceNamePreferenceController =
|
||||
new DeviceNamePreferenceController(mContext, "dummy_key");
|
||||
new DeviceNamePreferenceController(mContext, "unused_key");
|
||||
return deviceNamePreferenceController.getSummary();
|
||||
}
|
||||
}
|
||||
|
@@ -37,7 +37,7 @@ public class TopLevelDisplayPreferenceController extends BasePreferenceControlle
|
||||
@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()
|
||||
|
@@ -77,7 +77,7 @@ public class InactiveApps extends SettingsPreferenceFragment
|
||||
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);
|
||||
}
|
||||
|
||||
|
@@ -38,7 +38,7 @@ public abstract class StyleSuggestionActivityBase extends Activity {
|
||||
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);
|
||||
|
||||
|
@@ -69,7 +69,7 @@ public class WallpaperSuggestionActivity extends StyleSuggestionActivityBase imp
|
||||
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;
|
||||
|
Reference in New Issue
Block a user