From 11e91230367bd5dabcbf62b76d4596643c830144 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Mon, 16 Oct 2017 16:42:27 -0700
Subject: [PATCH] Reorder default app summary to match subpage ordering

Change-Id: I618f44ba8cf6f590b86d483cfecb090b71ef1268
Fixes: 65049890
Test: robotests
---
 .../android/settings/applications/DefaultAppSettings.java   | 6 +++---
 .../settings/applications/DefaultAppSettingsTest.java       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

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);