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

WiFi: Add Tx and rx link speed in network details

Browse Source 
current "link speed" in UI is renamed to "Transmit link speed".
Also Added Receive link speed in network details.

Bug: 120497598
Test: Connected to AP and verified the Rx link speed in Network details.

Change-Id: I01cf7362a27ad78ddfaef68efae4d07cbd14fc55
This commit is contained in:
Sunil Ravi
2019-01-08 13:50:42 -08:00
parent 1cb7e12fab
commit 39d372e676
7 changed files with 93 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -363,9 +363,14 @@ public class WifiConfigController implements TextWatcher,
}
WifiInfo info = mAccessPoint.getInfo();
if (info != null && info.getLinkSpeed() != -1) {
addRow(group, R.string.wifi_speed, String.format(
res.getString(R.string.link_speed), info.getLinkSpeed()));
if (info != null && info.getTxLinkSpeedMbps() != -1) {
addRow(group, R.string.tx_wifi_speed, String.format(
res.getString(R.string.tx_link_speed), info.getTxLinkSpeedMbps()));
}
if (info != null && info.getRxLinkSpeedMbps() != -1) {
addRow(group, R.string.rx_wifi_speed, String.format(
res.getString(R.string.rx_link_speed), info.getRxLinkSpeedMbps()));
}
if (info != null && info.getFrequency() != -1) {

9
src/com/android/settings/wifi/WifiStatusTest.java
View File

@@ -64,7 +64,8 @@ public class WifiStatusTest extends Activity {
private TextView mIPAddr;
private TextView mMACAddr;
private TextView mNetworkId;
private TextView mLinkSpeed;
private TextView mTxLinkSpeed;
private TextView mRxLinkSpeed;
private TextView mScanList;
@@ -142,7 +143,8 @@ public class WifiStatusTest extends Activity {
mIPAddr = (TextView) findViewById(R.id.ipaddr);
mMACAddr = (TextView) findViewById(R.id.macaddr);
mNetworkId = (TextView) findViewById(R.id.networkid);
mLinkSpeed = (TextView) findViewById(R.id.link_speed);
mTxLinkSpeed = (TextView) findViewById(R.id.tx_link_speed);
mRxLinkSpeed = (TextView) findViewById(R.id.rx_link_speed);
mScanList = (TextView) findViewById(R.id.scan_list);
@@ -186,7 +188,8 @@ public class WifiStatusTest extends Activity {
append((ipAddr >>>= 8) & 0xff);
mIPAddr.setText(ipBuf);
mLinkSpeed.setText(String.valueOf(wifiInfo.getLinkSpeed())+" Mbps");
mTxLinkSpeed.setText(String.valueOf(wifiInfo.getTxLinkSpeedMbps())+" Mbps");
mRxLinkSpeed.setText(String.valueOf(wifiInfo.getRxLinkSpeedMbps())+" Mbps");
mMACAddr.setText(wifiInfo.getMacAddress());
mNetworkId.setText(String.valueOf(wifiInfo.getNetworkId()));
mRSSI.setText(String.valueOf(wifiInfo.getRssi()));

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

@@ -99,7 +99,9 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
@VisibleForTesting
static final String KEY_SIGNAL_STRENGTH_PREF = "signal_strength";
@VisibleForTesting
static final String KEY_LINK_SPEED = "link_speed";
static final String KEY_TX_LINK_SPEED = "tx_link_speed";
@VisibleForTesting
static final String KEY_RX_LINK_SPEED = "rx_link_speed";
@VisibleForTesting
static final String KEY_FREQUENCY_PREF = "frequency";
@VisibleForTesting
@@ -138,7 +140,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
private ActionButtonsPreference mButtonsPref;
private EntityHeaderController mEntityHeaderController;
private Preference mSignalStrengthPref;
private Preference mLinkSpeedPref;
private Preference mTxLinkSpeedPref;
private Preference mRxLinkSpeedPref;
private Preference mFrequencyPref;
private Preference mSecurityPref;
private Preference mMacAddressPref;
@@ -291,7 +294,8 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
.setButton3OnClickListener(view -> shareNetwork());
mSignalStrengthPref = screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
mLinkSpeedPref = screen.findPreference(KEY_LINK_SPEED);
mTxLinkSpeedPref = screen.findPreference(KEY_TX_LINK_SPEED);
mRxLinkSpeedPref = screen.findPreference(KEY_RX_LINK_SPEED);
mFrequencyPref = screen.findPreference(KEY_FREQUENCY_PREF);
mSecurityPref = screen.findPreference(KEY_SECURITY_PREF);
@@ -367,11 +371,17 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
// MAC Address Pref
mMacAddressPref.setSummary(mWifiInfo.getMacAddress());
// Link Speed Pref
int linkSpeedMbps = mWifiInfo.getLinkSpeed();
mLinkSpeedPref.setVisible(linkSpeedMbps >= 0);
mLinkSpeedPref.setSummary(mContext.getString(
R.string.link_speed, mWifiInfo.getLinkSpeed()));
// Transmit Link Speed Pref
int txLinkSpeedMbps = mWifiInfo.getTxLinkSpeedMbps();
mTxLinkSpeedPref.setVisible(txLinkSpeedMbps >= 0);
mTxLinkSpeedPref.setSummary(mContext.getString(
R.string.tx_link_speed, mWifiInfo.getTxLinkSpeedMbps()));
// Receive Link Speed Pref
int rxLinkSpeedMbps = mWifiInfo.getRxLinkSpeedMbps();
mRxLinkSpeedPref.setVisible(rxLinkSpeedMbps >= 0);
mRxLinkSpeedPref.setSummary(mContext.getString(
R.string.rx_link_speed, mWifiInfo.getRxLinkSpeedMbps()));
// Frequency Pref
final int frequency = mWifiInfo.getFrequency();