Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d5928f6 authored by clownshen's avatar clownshen Committed by Clown SHEN
Browse files

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
parent 4d033779

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+3 −2
Original line number Diff line number Diff line
@@ -441,7 +441,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
        if (usingDataUsageHeader(mContext)) {

            mSummaryHeaderController.updateState(mDataUsageSummaryPref);

        } else {

            mEntityHeaderController.setSummary(mAccessPoint.getSettingsSummary())

            mEntityHeaderController.setSummary(

                    mAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))

                            .done(mFragment.getActivity(), true /* rebind */);

        }

    }

tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java

+19 −5
Original line number Diff line number Diff line
@@ -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);