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

Browse Source 
Change-Id: I4a4fa05ec2f2a1a6aa615030a446d46ef9065caf
This commit is contained in:
Jason Hsu
2020-04-21 09:44:20 +00:00
committed by Automerger Merge Worker
parent aade7d4eb2 0055a74794
commit d31f5d58d8
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();