PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update inclusive language for Accessibility Settings

Browse Source 
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: I67032d4beb7c8ae6b5a3271ea75ca38be4351484
This commit is contained in:
Edgar Wang
2020-08-06 00:34:35 +08:00
parent f534811627
commit dd032d3734
14 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java → tests/robotests/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java
View File

@@ -33,7 +33,7 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class MasterMonoPreferenceControllerTest {
public class PrimaryMonoPreferenceControllerTest {
private static final int ON = 1;
private static final int OFF = 0;
@@ -41,13 +41,13 @@ public class MasterMonoPreferenceControllerTest {
private Context mContext;
private SwitchPreference mPreference;
private MasterMonoPreferenceController mController;
private PrimaryMonoPreferenceController mController;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mPreference = new SwitchPreference(mContext);
mController = new MasterMonoPreferenceController(mContext, "master_mono");
mController = new PrimaryMonoPreferenceController(mContext, "test_key");
}
@Test

4
tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
View File

@@ -54,13 +54,13 @@ public class PrimarySwitchPreferenceTest {
mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate(
com.android.settingslib.R.layout.preference_two_target, null));
mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
inflater.inflate(R.layout.restricted_preference_widget_master_switch, mWidgetView, true);
inflater.inflate(R.layout.restricted_preference_widget_primary_switch, mWidgetView, true);
}
@Test
public void createNewPreference_shouldSetLayout() {
assertThat(mPreference.getWidgetLayoutResource())
.isEqualTo(R.layout.restricted_preference_widget_master_switch);
.isEqualTo(R.layout.restricted_preference_widget_primary_switch);
}
@Test