Merge "Update R acessibility assets and strings (2/n)" into rvc-dev am: 873b50a46a am: 4c69bcab70 am: 5ed8894807 am: e5be54a8f4

Change-Id: I31126710d4b2085711992fcb3da0ffef6e804a23
This commit is contained in:
Automerger Merge Worker
2020-03-12 06:43:06 +00:00
5 changed files with 45 additions and 15 deletions

View File

@@ -130,14 +130,17 @@ public class AccessibilitySettingsTest {
}
@Test
public void getServiceSummary_invisibleType_showsDefaultSummary() {
public void getServiceSummary_invisibleType_shortcutDisabled_showsOffSummary() {
setInvisibleFragmentType(mServiceInfo);
doReturn(DEFAULT_SUMMARY).when(mServiceInfo).loadSummary(any());
final CharSequence summary = AccessibilitySettings.getServiceSummary(mContext,
mServiceInfo, SERVICE_ENABLED);
assertThat(summary).isEqualTo(DEFAULT_SUMMARY);
assertThat(summary).isEqualTo(
mContext.getString(R.string.preference_summary_default_combination,
mContext.getString(R.string.accessibility_summary_shortcut_disabled),
DEFAULT_SUMMARY));
}
@Test