Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arc Wang
2020-01-16 15:29:17 +00:00
committed by Android (Google) Code Review
parent e46c7474a2 c72460f73e
commit 287e33b223
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/wifi/WifiEntryPreference.java
View File

@@ -118,7 +118,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
notifyChanged();
}
setSummary(mWifiEntry.getSummary());
setSummary(mWifiEntry.getSummary(false /* concise */));
mContentDescription = buildContentDescription();
}

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

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