diff --git a/src/com/android/settings/applications/DefaultAppSettings.java b/src/com/android/settings/applications/DefaultAppSettings.java index 5b15e516a5d..bcbc91712ac 100644 --- a/src/com/android/settings/applications/DefaultAppSettings.java +++ b/src/com/android/settings/applications/DefaultAppSettings.java @@ -133,10 +133,10 @@ public class DefaultAppSettings extends DashboardFragment { return; } CharSequence summary = concatSummaryText( - mDefaultSmsPreferenceController.getDefaultAppLabel(), - mDefaultBrowserPreferenceController.getDefaultAppLabel()); - summary = concatSummaryText(summary, + mDefaultBrowserPreferenceController.getDefaultAppLabel(), mDefaultPhonePreferenceController.getDefaultAppLabel()); + summary = concatSummaryText(summary, + mDefaultSmsPreferenceController.getDefaultAppLabel()); if (!TextUtils.isEmpty(summary)) { mSummaryLoader.setSummary(this, summary); } diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java index 9054a8e52b4..9441707a4b4 100644 --- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java @@ -95,7 +95,7 @@ public class DefaultAppSettingsTest { when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1"); when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1"); summaryProvider.setListening(true); - verify(summaryLoader).setSummary(summaryProvider, "Sms1, Browser1, Phone1"); + verify(summaryLoader).setSummary(summaryProvider, "Browser1, Phone1, Sms1"); // 2 available when(defaultSms.getDefaultAppLabel()).thenReturn(null); @@ -108,13 +108,13 @@ public class DefaultAppSettingsTest { when(defaultBrowser.getDefaultAppLabel()).thenReturn(null); when(defaultPhone.getDefaultAppLabel()).thenReturn("Phone1"); summaryProvider.setListening(true); - verify(summaryLoader).setSummary(summaryProvider, "Sms1, Phone1"); + verify(summaryLoader).setSummary(summaryProvider, "Phone1, Sms1"); when(defaultSms.getDefaultAppLabel()).thenReturn("Sms1"); when(defaultBrowser.getDefaultAppLabel()).thenReturn("Browser1"); when(defaultPhone.getDefaultAppLabel()).thenReturn(null); summaryProvider.setListening(true); - verify(summaryLoader).setSummary(summaryProvider, "Sms1, Browser1"); + verify(summaryLoader).setSummary(summaryProvider, "Phone1, Sms1"); // 1 available when(defaultSms.getDefaultAppLabel()).thenReturn(null);