diff options
2 files changed, 3 insertions, 5 deletions
diff --git a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java index 5f47be4b0642..cb858c85e888 100644 --- a/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java +++ b/packages/SettingsLib/MainSwitchPreference/src/com/android/settingslib/widget/MainSwitchBar.java @@ -152,9 +152,6 @@ 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()); - } } } diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java index 0845ca325d38..d86bd014988e 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/MainSwitchBarTest.java @@ -19,6 +19,7 @@ package com.android.settingslib.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; +import android.text.TextUtils; import android.view.View; import android.widget.Switch; import android.widget.TextView; @@ -59,13 +60,13 @@ public class MainSwitchBarTest { } @Test - public void setTitle_switchShouldHasContentDescription() { + public void setTitle_switchShouldNotHasContentDescription() { final String title = "title"; mBar.setTitle(title); final Switch switchObj = mBar.getSwitch(); - assertThat(switchObj.getContentDescription()).isEqualTo(title); + assertThat(TextUtils.isEmpty(switchObj.getContentDescription())).isTrue(); } @Test |