Merge "Fix no response after Talkback users double-tap on Learn more in Accessibility pages" into tm-dev

This commit is contained in:
Menghan Li
2022-03-16 03:03:29 +00:00
committed by Android (Google) Code Review
5 changed files with 35 additions and 7 deletions

View File

@@ -121,4 +121,16 @@ public class AccessibilityFooterPreferenceControllerTest {
assertThat(learnMoreView.getVisibility()).isEqualTo(View.GONE);
assertThat(mPreference.isLinkEnabled()).isFalse();
}
@Test
public void onBindViewHolder_setHelpResource_expectSummaryViewIsNonFocusable() {
mController.setupHelpLink(R.string.help_url_timeout, TEST_CONTENT_DESCRIPTION);
mController.displayPreference(mScreen);
mPreference.onBindViewHolder(mPreferenceViewHolder);
final TextView summaryView = (TextView) mPreferenceViewHolder
.findViewById(android.R.id.title);
assertThat(summaryView.isFocusable()).isFalse();
}
}

View File

@@ -71,4 +71,15 @@ public final class AccessibilityFooterPreferenceTest {
android.R.id.title);
assertThat(summaryView.getMovementMethod()).isInstanceOf(MovementMethod.class);
}
@Test
public void onBindViewHolder_setLinkEnabled_expectSummaryViewIsNonFocusable() {
mAccessibilityFooterPreference.setLinkEnabled(true);
mAccessibilityFooterPreference.onBindViewHolder(mPreferenceViewHolder);
final TextView summaryView = (TextView) mPreferenceViewHolder.findViewById(
android.R.id.title);
assertThat(summaryView.isFocusable()).isFalse();
}
}

View File

@@ -322,7 +322,7 @@ public class ToggleFeaturePreferenceFragmentTest {
(AccessibilityFooterPreference) mFragment.getPreferenceScreen().getPreference(
mFragment.getPreferenceScreen().getPreferenceCount() - 1);
assertThat(accessibilityFooterPreference.getSummary()).isEqualTo(DEFAULT_SUMMARY);
assertThat(accessibilityFooterPreference.isSelectable()).isEqualTo(true);
assertThat(accessibilityFooterPreference.isSelectable()).isEqualTo(false);
assertThat(accessibilityFooterPreference.getOrder()).isEqualTo(Integer.MAX_VALUE - 1);
}