Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Talkback say twice in MainSwitch" into sc-dev am: bf929bbd3b

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

Change-Id: I74cdef1fb65fac30600a6d8180529bc80b9f79d9
This commit is contained in:
TreeHugger Robot
2021-07-01 14:07:57 +00:00
committed by Automerger Merge Worker
parent 192818d7a5 bf929bbd3b
commit 34cc5ff51b
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());
}
}
}

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

@@ -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