From 0d5928f6f100fffada66974998c06709783dcf32 Mon Sep 17 00:00:00 2001
From: clownshen <clownshen@google.com>
Date: Tue, 23 Apr 2019 17:08:49 +0800
Subject: [PATCH] Show "Disconnected" instead of "Saved" in detail page summary

To improve UX, show summary as "Disconnected" is more make sense to end
user instead of "Saved" in detail page, it's decision-maker to click
connect button.

Bug: 131119614
Test: manual test
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest

Change-Id: I26ea0c566daab6214a596509f972005fd37fab4d
---
 .../WifiDetailPreferenceController.java       |  5 ++--
 .../WifiDetailPreferenceControllerTest.java   | 24 +++++++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index f98dc589579..e077efa9257 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -441,8 +441,9 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
         if (usingDataUsageHeader(mContext)) {
             mSummaryHeaderController.updateState(mDataUsageSummaryPref);
         } else {
-            mEntityHeaderController.setSummary(mAccessPoint.getSettingsSummary())
-                    .done(mFragment.getActivity(), true /* rebind */);
+            mEntityHeaderController.setSummary(
+                    mAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
+                            .done(mFragment.getActivity(), true /* rebind */);
         }
     }
 
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index d4ce481e005..02642dcf786 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -519,13 +519,23 @@ public class WifiDetailPreferenceControllerTest {
     public void entityHeader_shouldHaveSummarySet() {
         setUpForConnectedNetwork();
         String summary = "summary";
-        when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
+        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
+                .thenReturn(summary);
 
         displayAndResume();
 
         verify(mockHeaderController).setSummary(summary);
     }
 
+    @Test
+    public void entityHeader_shouldConvertSavedAsDisconnected() {
+        setUpForDisconnectedNetwork();
+
+        displayAndResume();
+
+        verify(mockAccessPoint, times(1)).getSettingsSummary(true /*convertSavedAsDisconnected*/);
+    }
+
     @Test
     public void signalStrengthPref_shouldHaveIconSetForConnectedNetwork() {
         setUpForConnectedNetwork();
@@ -950,7 +960,8 @@ public class WifiDetailPreferenceControllerTest {
                 .thenReturn(new NetworkCapabilities(nc));
 
         String summary = "Connected, no Internet";
-        when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
+        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
+                .thenReturn(summary);
 
         InOrder inOrder = inOrder(mockHeaderController);
         displayAndResume();
@@ -959,7 +970,8 @@ public class WifiDetailPreferenceControllerTest {
         // Check that an irrelevant capability update does not update the access point summary, as
         // doing so could cause unnecessary jank...
         summary = "Connected";
-        when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
+        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
+                .thenReturn(summary);
         updateNetworkCapabilities(nc);
         inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
 
@@ -969,7 +981,8 @@ public class WifiDetailPreferenceControllerTest {
         inOrder.verify(mockHeaderController).setSummary(summary);
 
         summary = "Connected, no Internet";
-        when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
+        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
+                .thenReturn(summary);
 
         // Another irrelevant update won't cause the UI to refresh...
         updateNetworkCapabilities(nc);
@@ -982,7 +995,8 @@ public class WifiDetailPreferenceControllerTest {
 
         // UI will be refreshed when device connects to a partial connectivity network.
         summary = "Limited connection";
-        when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
+        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
+                .thenReturn(summary);
         nc.addCapability(NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY);
         updateNetworkCapabilities(nc);
         inOrder.verify(mockHeaderController).setSummary(summary);