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

Merge "Update inclusive language for Accessibility Settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-12 02:28:23 +00:00
committed by Android (Google) Code Review
parent ec93f346fe dd032d3734
commit 3c8f93a6a5
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