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

Merge "Add content description to the master switch toggle button." into oc-dev

Browse Source 
am: 10158feecf

Change-Id: Icc68b53cbbb93755c7ce90db1c4d2f70d5e44cd1
This commit is contained in:
Doris Ling
2017-04-28 19:34:34 +00:00
committed by android-build-merger
parent 5c5b801371 10158feecf
commit 79d8e5db66
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/widget/MasterSwitchPreference.java
View File

@@ -83,6 +83,7 @@ public class MasterSwitchPreference extends TwoTargetPreference {
mSwitch = (Switch) holder.findViewById(R.id.switchWidget); mSwitch = (Switch) holder.findViewById(R.id.switchWidget);
if (mSwitch != null) { if (mSwitch != null) {
mSwitch.setContentDescription(getTitle());
mSwitch.setChecked(mChecked); mSwitch.setChecked(mChecked);
mSwitch.setEnabled(mEnableSwitch); mSwitch.setEnabled(mEnableSwitch);
} }

15
tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
View File

@@ -183,4 +183,19 @@ public class MasterSwitchPreferenceTest {
preference.setDisabledByAdmin(null); preference.setDisabledByAdmin(null);
assertThat(toggle.isEnabled()).isTrue(); assertThat(toggle.isEnabled()).isTrue();
} }
@Test
public void onBindViewHolder_toggleButtonShouldHaveContentDescription() {
final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
LayoutInflater.from(mContext)
.inflate(R.layout.preference_widget_master_switch, null));
final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
final String label = "TestButton";
preference.setTitle(label);
preference.onBindViewHolder(holder);
assertThat(toggle.getContentDescription()).isEqualTo(label);
}
} }