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

Commit 287e33b2 authored by Arc Wang's avatar Arc Wang Committed by Android (Google) Code Review
Browse files

Merge "[Wi-Fi] Get a summary of more information from WifiEntry#getSummary"

parents e46c7474 c72460f7

packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt 
            notifyChanged();

        }



        setSummary(mWifiEntry.getSummary());

        setSummary(mWifiEntry.getSummary(false /* concise */));

        mContentDescription = buildContentDescription();

    }

packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiEntryPreferenceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public class WifiEntryPreferenceTest { 
        MockitoAnnotations.initMocks(this);



        when(mMockWifiEntry.getTitle()).thenReturn(MOCK_TITLE);

        when(mMockWifiEntry.getSummary()).thenReturn(MOCK_SUMMARY);

        when(mMockWifiEntry.getSummary(false /* concise */)).thenReturn(MOCK_SUMMARY);



        when(mMockIconInjector.getIcon(0)).thenReturn(mMockDrawable0);

        when(mMockIconInjector.getIcon(1)).thenReturn(mMockDrawable1);
@@ -112,7 +112,7 @@ public class WifiEntryPreferenceTest { 
        final WifiEntryPreference pref =

                new WifiEntryPreference(mContext, mMockWifiEntry, mMockIconInjector);

        final String updatedSummary = "updated summary";

        when(mMockWifiEntry.getSummary()).thenReturn(updatedSummary);

        when(mMockWifiEntry.getSummary(false /* concise */)).thenReturn(updatedSummary);



        pref.refresh();