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: Idf3cb1eca8b814d5863f286f6a46f79fc5e7a967
This commit is contained in:
@@ -54,13 +54,13 @@ public class SliceControllerInXmlCodeInspector extends CodeInspector {
|
||||
);
|
||||
|
||||
private final List<String> mXmlDeclaredControllers = new ArrayList<>();
|
||||
private final List<String> mGrandfatheredClasses = new ArrayList<>();
|
||||
private final List<String> mExemptedClasses = new ArrayList<>();
|
||||
|
||||
private final String ERROR_MISSING_CONTROLLER =
|
||||
"The following controllers were expected to be declared by "
|
||||
+ "'settings:controller=Controller_Class_Name' in their corresponding Xml. "
|
||||
+ "If it should not appear in XML, add the controller's classname to "
|
||||
+ "grandfather_slice_controller_not_in_xml. Controllers:\n";
|
||||
+ "exempt_slice_controller_not_in_xml. Controllers:\n";
|
||||
|
||||
private final Context mContext;
|
||||
private final SearchFeatureProvider mSearchProvider;
|
||||
@@ -73,8 +73,8 @@ public class SliceControllerInXmlCodeInspector extends CodeInspector {
|
||||
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
mFakeFeatureFactory.searchFeatureProvider = mSearchProvider;
|
||||
|
||||
CodeInspector.initializeGrandfatherList(mGrandfatheredClasses,
|
||||
"grandfather_slice_controller_not_in_xml");
|
||||
CodeInspector.initializeExemptList(mExemptedClasses,
|
||||
"exempt_slice_controller_not_in_xml");
|
||||
initDeclaredControllers();
|
||||
}
|
||||
|
||||
@@ -117,7 +117,7 @@ public class SliceControllerInXmlCodeInspector extends CodeInspector {
|
||||
}
|
||||
|
||||
// Removed whitelisted classes
|
||||
missingControllersInXml.removeAll(mGrandfatheredClasses);
|
||||
missingControllersInXml.removeAll(mExemptedClasses);
|
||||
|
||||
final String missingControllerError =
|
||||
buildErrorMessage(ERROR_MISSING_CONTROLLER, missingControllersInXml);
|
||||
|
Reference in New Issue
Block a user