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

Merge "Announce scaled value for font scaling seekbar in Talkback" into udc-dev am: 470dbd6884 am: c96e19f819

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347809

Change-Id: I66795c6f016a705acdd20526b443e50f8f89cac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Candice Lo
2023-04-01 02:57:51 +00:00
committed by Automerger Merge Worker
parent c6ace6cf14 c96e19f819
commit b8206c85c9
3 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
View File

@@ -43,6 +43,7 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowInteractionJankMonitor;
import com.android.settings.widget.LabeledSeekBarPreference;
import com.android.settings.widget.SeekBarPreference;
import org.junit.Before;
import org.junit.Test;
@@ -75,6 +76,7 @@ public class PreviewSizeSeekBarControllerTest {
private PreferenceViewHolder mHolder;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PreferenceManager mPreferenceManager;
private SeekBar mSeekBar;
@Mock
private PreviewSizeSeekBarController.ProgressInteractionListener mInteractionListener;
@@ -101,8 +103,10 @@ public class PreviewSizeSeekBarControllerTest {
mSeekBarPreference.setKey(FONT_SIZE_KEY);
LayoutInflater inflater = LayoutInflater.from(mContext);
mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate(
R.layout.preference_labeled_slider, null));
mHolder = spy(PreferenceViewHolder.createInstanceForTests(inflater.inflate(
R.layout.preference_labeled_slider, null)));
mSeekBar = spy(new SeekBar(mContext));
doReturn(mSeekBar).when(mHolder).findViewById(com.android.internal.R.id.seekbar);
mSeekBarPreference.onBindViewHolder(mHolder);
when(mPreferenceScreen.findPreference(anyString())).thenReturn(mSeekBarPreference);
@@ -224,6 +228,22 @@ public class PreviewSizeSeekBarControllerTest {
assertThat(getLatestPopupWindow().isShowing()).isTrue();
}
@Test
public void onProgressChanged_setCorrespondingCustomizedStateDescription() {
String[] stateLabels = new String[]{"1", "2", "3", "4", "5"};
mSeekBarController.setProgressStateLabels(stateLabels);
mSeekBarController.displayPreference(mPreferenceScreen);
int progress = 3;
mSeekBarPreference.setProgress(progress);
mSeekBarPreference.onProgressChanged(mSeekBar,
progress,
/* fromUser= */ false);
verify(mSeekBarPreference).setSeekBarStateDescription(stateLabels[progress]);
assertThat(mSeekBar.getStateDescription().toString()).isEqualTo(stateLabels[progress]);
}
private static class TestFragment extends SettingsPreferenceFragment {
@Override