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

Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: d31f5d58d8 am: 69eade7c4e am: 9103cf5254

Browse Source 
Change-Id: I8d77752b010f610d852ada909112e160694a800f
This commit is contained in:
Jason Hsu
2020-04-21 10:43:36 +00:00
committed by Automerger Merge Worker
parent 7ef5a06d2b 9103cf5254
commit 51dfd5b356
3 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
View File

@@ -214,17 +214,6 @@ public class AccessibilitySettingsTest {
assertThat(description).isEqualTo(DEFAULT_DESCRIPTION);
}
@Test
public void getServiceDescription_noDescription_showsDefaultString() {
doReturn(EMPTY_STRING).when(mServiceInfo).loadDescription(any());
final CharSequence description = AccessibilitySettings.getServiceDescription(mContext,
mServiceInfo, SERVICE_ENABLED);
assertThat(description).isEqualTo(
mContext.getString(R.string.accessibility_service_default_description));
}
@Test
public void createAccessibilityServicePreferenceList_hasOneInfo_containsSameKey() {
final String key = DUMMY_COMPONENT_NAME.flattenToString();