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

Merge "Use speed string from WifiEntry" into udc-qpr-dev

Browse Source
This commit is contained in:
Quang Luong
2023-07-06 01:49:56 +00:00
committed by Android (Google) Code Review
parent 8f88d32f18 260142b495
commit 062c4b634d
2 changed files with 18 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -637,29 +637,23 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
} }
private void refreshTxSpeed() { private void refreshTxSpeed() {
if (mWifiInfo == null String summary = mWifiEntry.getTxSpeedString();
|| mWifiEntry.getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) { if (TextUtils.isEmpty(summary)) {
mTxLinkSpeedPref.setVisible(false); mTxLinkSpeedPref.setVisible(false);
return; return;
} }
mTxLinkSpeedPref.setVisible(true);
int txLinkSpeedMbps = mWifiInfo.getTxLinkSpeedMbps(); mTxLinkSpeedPref.setSummary(summary);
mTxLinkSpeedPref.setVisible(txLinkSpeedMbps >= 0);
mTxLinkSpeedPref.setSummary(mContext.getString(
R.string.tx_link_speed, mWifiInfo.getTxLinkSpeedMbps()));
} }
private void refreshRxSpeed() { private void refreshRxSpeed() {
if (mWifiInfo == null String summary = mWifiEntry.getRxSpeedString();
|| mWifiEntry.getConnectedState() != WifiEntry.CONNECTED_STATE_CONNECTED) { if (TextUtils.isEmpty(summary)) {
mRxLinkSpeedPref.setVisible(false); mRxLinkSpeedPref.setVisible(false);
return; return;
} }
mRxLinkSpeedPref.setVisible(true);
int rxLinkSpeedMbps = mWifiInfo.getRxLinkSpeedMbps(); mRxLinkSpeedPref.setSummary(summary);
mRxLinkSpeedPref.setVisible(rxLinkSpeedMbps >= 0);
mRxLinkSpeedPref.setSummary(mContext.getString(
R.string.rx_link_speed, mWifiInfo.getRxLinkSpeedMbps()));
} }
private void refreshSsid() { private void refreshSsid() {

60
tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
View File

@@ -701,10 +701,10 @@ public class WifiDetailPreferenceController2Test {
} }
@Test @Test
public void linkSpeedPref_shouldNotShowIfNotSet() { public void linkSpeedPref_shouldNotShowIfSpeedStringIsEmpty() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
setUpSpyController(); setUpSpyController();
when(mMockWifiInfo.getTxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN); when(mMockWifiEntry.getTxSpeedString()).thenReturn("");
displayAndResume(); displayAndResume();
@@ -712,42 +712,22 @@ public class WifiDetailPreferenceController2Test {
} }
@Test @Test
public void linkSpeedPref_shouldVisibleForConnectedNetwork() { public void linkSpeedPref_shouldBeVisibleIfSpeedStringIsNotEmpty() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
setUpSpyController(); setUpSpyController();
String expectedLinkSpeed = mContext.getString(R.string.tx_link_speed, TX_LINK_SPEED); when(mMockWifiEntry.getTxSpeedString()).thenReturn("100 Mbps");
displayAndResume(); displayAndResume();
verify(mMockTxLinkSpeedPref).setVisible(true); verify(mMockTxLinkSpeedPref).setVisible(true);
verify(mMockTxLinkSpeedPref).setSummary(expectedLinkSpeed); verify(mMockTxLinkSpeedPref).setSummary("100 Mbps");
} }
@Test @Test
public void linkSpeedPref_shouldInvisibleForDisconnectedNetwork() { public void rxLinkSpeedPref_shouldNotShowIfSpeedStringIsEmpty() {
setUpForDisconnectedNetwork();
displayAndResume();
verify(mMockTxLinkSpeedPref).setVisible(false);
verify(mMockTxLinkSpeedPref, never()).setSummary(any(String.class));
}
@Test
public void linkSpeedPref_shouldInvisibleForNotInRangeNetwork() {
setUpForNotInRangeNetwork();
displayAndResume();
verify(mMockTxLinkSpeedPref).setVisible(false);
verify(mMockTxLinkSpeedPref, never()).setSummary(any(String.class));
}
@Test
public void rxLinkSpeedPref_shouldNotShowIfNotSet() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
setUpSpyController(); setUpSpyController();
when(mMockWifiInfo.getRxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN); when(mMockWifiEntry.getRxSpeedString()).thenReturn("");
displayAndResume(); displayAndResume();
@@ -755,35 +735,15 @@ public class WifiDetailPreferenceController2Test {
} }
@Test @Test
public void rxLinkSpeedPref_shouldVisibleForConnectedNetwork() { public void rxLinkSpeedPref_shouldBeVisibleIfSpeedStringIsNotEmpty() {
setUpForConnectedNetwork(); setUpForConnectedNetwork();
setUpSpyController(); setUpSpyController();
String expectedLinkSpeed = mContext.getString(R.string.rx_link_speed, RX_LINK_SPEED); when(mMockWifiEntry.getRxSpeedString()).thenReturn("100 Mbps");
displayAndResume(); displayAndResume();
verify(mMockRxLinkSpeedPref).setVisible(true); verify(mMockRxLinkSpeedPref).setVisible(true);
verify(mMockRxLinkSpeedPref).setSummary(expectedLinkSpeed); verify(mMockRxLinkSpeedPref).setSummary("100 Mbps");
}
@Test
public void rxLinkSpeedPref_shouldInvisibleForDisconnectedNetwork() {
setUpForDisconnectedNetwork();
displayAndResume();
verify(mMockRxLinkSpeedPref).setVisible(false);
verify(mMockRxLinkSpeedPref, never()).setSummary(any(String.class));
}
@Test
public void rxLinkSpeedPref_shouldInvisibleForNotInRangeNetwork() {
setUpForNotInRangeNetwork();
displayAndResume();
verify(mMockRxLinkSpeedPref).setVisible(false);
verify(mMockRxLinkSpeedPref, never()).setSummary(any(String.class));
} }
@Test @Test