commit 429d7624fbc1d634312ea629ea0d8195096cef9c
author Sunny Shao <sunnyshao@google.com> Wed Jun 30 19:22:33 2021 +0800
committer Sunny Shao <sunnyshao@google.com> Thu Jul 01 15:17:13 2021 +0800
tree 5eb0e4421135ee087c33daf97c7815bd8f58a428
parent f56767128cb3406aa87fa87981dc9d73ccfae3a9

Fix Talkback say twice in MainSwitch

- Remove the duplicated setting in the ContentDescription.

Bug: 191735947
Test: manual test
Test: make RunSettingsLibRoboTests -j ROBOTEST_FILTER=com.android.settingslib.widget
Change-Id: If28d0002dd1087173623b654c67bc7597d721a85

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

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 5f47be4..cb858c8 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 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

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 0845ca3..d86bd01 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 @@
 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 @@
     }
 
     @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