PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev

Browse Source 
am: fbcf3708a6

Change-Id: I9d3f7e0d3c5afe2c339401aceebaef82e6761d0e
This commit is contained in:
Clown SHEN
2019-04-30 07:20:47 -07:00
committed by android-build-merger
parent 91eefed117 fbcf3708a6
commit dba84b1781
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
View File

@@ -441,8 +441,9 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
if (usingDataUsageHeader(mContext)) { if (usingDataUsageHeader(mContext)) {
mSummaryHeaderController.updateState(mDataUsageSummaryPref); mSummaryHeaderController.updateState(mDataUsageSummaryPref);
} else { } else {
mEntityHeaderController.setSummary(mAccessPoint.getSettingsSummary()) mEntityHeaderController.setSummary(
.done(mFragment.getActivity(), true /* rebind */); mAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
.done(mFragment.getActivity(), true /* rebind */);
} }
} }

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

@@ -519,13 +519,23 @@ public class WifiDetailPreferenceControllerTest {
public void entityHeader_shouldHaveSummarySet() { public void entityHeader_shouldHaveSummarySet() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
String summary = "summary"; String summary = "summary";
when(mockAccessPoint.getSettingsSummary()).thenReturn(summary); when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
.thenReturn(summary);
displayAndResume(); displayAndResume();
verify(mockHeaderController).setSummary(summary); verify(mockHeaderController).setSummary(summary);
} }
@Test
public void entityHeader_shouldConvertSavedAsDisconnected() {
setUpForDisconnectedNetwork();
displayAndResume();
verify(mockAccessPoint, times(1)).getSettingsSummary(true /*convertSavedAsDisconnected*/);
}
@Test @Test
public void signalStrengthPref_shouldHaveIconSetForConnectedNetwork() { public void signalStrengthPref_shouldHaveIconSetForConnectedNetwork() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
@@ -950,7 +960,8 @@ public class WifiDetailPreferenceControllerTest {
.thenReturn(new NetworkCapabilities(nc)); .thenReturn(new NetworkCapabilities(nc));
String summary = "Connected, no Internet"; String summary = "Connected, no Internet";
when(mockAccessPoint.getSettingsSummary()).thenReturn(summary); when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
.thenReturn(summary);
InOrder inOrder = inOrder(mockHeaderController); InOrder inOrder = inOrder(mockHeaderController);
displayAndResume(); displayAndResume();
@@ -959,7 +970,8 @@ public class WifiDetailPreferenceControllerTest {
// Check that an irrelevant capability update does not update the access point summary, as // Check that an irrelevant capability update does not update the access point summary, as
// doing so could cause unnecessary jank... // doing so could cause unnecessary jank...
summary = "Connected"; summary = "Connected";
when(mockAccessPoint.getSettingsSummary()).thenReturn(summary); when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
.thenReturn(summary);
updateNetworkCapabilities(nc); updateNetworkCapabilities(nc);
inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class)); inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
@@ -969,7 +981,8 @@ public class WifiDetailPreferenceControllerTest {
inOrder.verify(mockHeaderController).setSummary(summary); inOrder.verify(mockHeaderController).setSummary(summary);
summary = "Connected, no Internet"; 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... // Another irrelevant update won't cause the UI to refresh...
updateNetworkCapabilities(nc); updateNetworkCapabilities(nc);
@@ -982,7 +995,8 @@ public class WifiDetailPreferenceControllerTest {
// UI will be refreshed when device connects to a partial connectivity network. // UI will be refreshed when device connects to a partial connectivity network.
summary = "Limited connection"; summary = "Limited connection";
when(mockAccessPoint.getSettingsSummary()).thenReturn(summary); when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
.thenReturn(summary);
nc.addCapability(NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY); nc.addCapability(NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY);
updateNetworkCapabilities(nc); updateNetworkCapabilities(nc);
inOrder.verify(mockHeaderController).setSummary(summary); inOrder.verify(mockHeaderController).setSummary(summary);