Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41f6671a authored May 22, 2021 by TreeHugger Robot Committed by Automerger Merge Worker May 22, 2021

Merge "The MainSwitch should has the accessibility label." into sc-dev am: 8253fe8c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14660734

Change-Id: I5830eb6f13be29381c1d0f4eb0abeb029294e69a

parents 1cb37ca0 8253fe8c

packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,9 @@ public class MainSwitchBar extends LinearLayout implements CompoundButton.OnChec
		public void setTitle(CharSequence text) {
		if (mTextView != null) {
		mTextView.setText(text);
		if (mSwitch != null) {
		mSwitch.setContentDescription(mTextView.getText());
		}
		}
		}

packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,16 @@ public class MainSwitchBarTest {
		assertThat(textView.getText()).isEqualTo(title);
		}

		@Test
		public void setTitle_switchShouldHasContentDescription() {
		final String title = "title";

		mBar.setTitle(title);

		final Switch switchObj = mBar.getSwitch();
		assertThat(switchObj.getContentDescription()).isEqualTo(title);
		}

		@Test
		public void getSwitch_shouldNotNull() {
		final Switch switchObj = mBar.getSwitch();