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

Merge "Reorder default app summary to match subpage ordering"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-17 01:15:45 +00:00
committed by Android (Google) Code Review
parent 573f3d5917 11e9123036
commit 84f1e3003a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/applications/DefaultAppSettings.java
View File

@@ -133,10 +133,10 @@ public class DefaultAppSettings extends DashboardFragment {
return; return;
} }
CharSequence summary = concatSummaryText( CharSequence summary = concatSummaryText(
mDefaultSmsPreferenceController.getDefaultAppLabel(), mDefaultBrowserPreferenceController.getDefaultAppLabel(),
mDefaultBrowserPreferenceController.getDefaultAppLabel());
summary = concatSummaryText(summary,
mDefaultPhonePreferenceController.getDefaultAppLabel()); mDefaultPhonePreferenceController.getDefaultAppLabel());
summary = concatSummaryText(summary,
mDefaultSmsPreferenceController.getDefaultAppLabel());
if (!TextUtils.isEmpty(summary)) { if (!TextUtils.isEmpty(summary)) {
mSummaryLoader.setSummary(this, summary); mSummaryLoader.setSummary(this, summary);
} }

6
tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
View File

@@ -95,7 +95,7 @@ public class DefaultAppSettingsTest {
when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1"); when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1");
when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1"); when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1");
summaryProvider.setListening(true); summaryProvider.setListening(true);
verify(summaryLoader).setSummary(summaryProvider, "Sms1, Browser1, Phone1"); verify(summaryLoader).setSummary(summaryProvider, "Browser1, Phone1, Sms1");
// 2 available // 2 available
when(defaultSms.getDefaultAppLabel()).thenReturn(null); when(defaultSms.getDefaultAppLabel()).thenReturn(null);
@@ -108,13 +108,13 @@ public class DefaultAppSettingsTest {
when(defaultBrowser.getDefaultAppLabel()).thenReturn(null); when(defaultBrowser.getDefaultAppLabel()).thenReturn(null);
when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1"); when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1");
summaryProvider.setListening(true); summaryProvider.setListening(true);
verify(summaryLoader).setSummary(summaryProvider, "Sms1, Phone1"); verify(summaryLoader).setSummary(summaryProvider, "Phone1, Sms1");
when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1"); when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1");
when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1"); when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1");
when(defaultPhone.getDefaultAppLabel()).thenReturn(null); when(defaultPhone.getDefaultAppLabel()).thenReturn(null);
summaryProvider.setListening(true); summaryProvider.setListening(true);
verify(summaryLoader).setSummary(summaryProvider, "Sms1, Browser1"); verify(summaryLoader).setSummary(summaryProvider, "Phone1, Sms1");
// 1 available // 1 available
when(defaultSms.getDefaultAppLabel()).thenReturn(null); when(defaultSms.getDefaultAppLabel()).thenReturn(null);