Merge "WiFi: Add Tx and rx link speed in network details" (00020f66) · Commits · e / os / android_packages_apps_Settings

res/layout/wifi_status_test.xml

+9 −3

Original line number	Diff line number	Diff line
		@@ -90,10 +90,16 @@
		<TextView android:id="@+id/networkid" style="@style/info_value" />
		</LinearLayout>

		<!--Link Speed Value-->
		<!--Transmit Link Speed Value-->
		<LinearLayout style="@style/entry_layout">
		<TextView android:text="@string/link_speed_label" style="@style/info_label" />
		<TextView android:id="@+id/link_speed" style="@style/info_value" />
		<TextView android:text="@string/tx_link_speed_label" style="@style/info_label" />
		<TextView android:id="@+id/tx_link_speed" style="@style/info_value" />
		</LinearLayout>

		<!--Receive Link Speed Value-->
		<LinearLayout style="@style/entry_layout">
		<TextView android:text="@string/rx_link_speed_label" style="@style/info_label" />
		<TextView android:id="@+id/rx_link_speed" style="@style/info_value" />
		</LinearLayout>

		<LinearLayout style="@style/entry_layout">

res/values/strings.xml

+12 −5

Original line number	Diff line number	Diff line
		@@ -1834,8 +1834,10 @@
		<string name="wifi_sign_in_button_text">Sign in</string>
		<!-- Wifi Sign in CTA for wifi settings when captive portal auth is required [CHAR LIMIT = 50] -->
		<string name="wifi_tap_to_sign_in">Tap here to sign in to network</string>
		<!-- Link speed on Wifi Status screen -->
		<string name="link_speed">%1$d Mbps</string>
		<!-- Transmit Link speed on Wifi Status screen [CHAR LIMIT=32] -->
		<string name="tx_link_speed"><xliff:g id="Transmit link speed" example="150 Mbps">%1$d</xliff:g> Mbps</string>
		<!-- Receive Link speed on Wifi Status screen [CHAR LIMIT=32] -->
		<string name="rx_link_speed"><xliff:g id="Receive link speed" example="54 Mbps">%1$d</xliff:g> Mbps</string>

		<!-- This string asks the user whether or not to allow an app to enable WiFi. [CHAR LIMIT=NONE] -->
		<string name="wifi_ask_enable"><xliff:g id="requester" example="FancyApp">%s</xliff:g> wants to turn on Wi-Fi</string>
		@@ -2030,8 +2032,10 @@
		<string name="wifi_signal">Signal strength</string>
		<!-- Label for the status of the connection -->
		<string name="wifi_status">Status</string>
		<!-- Label for the link speed of the connection -->
		<string name="wifi_speed">Link speed</string>
		<!-- Label for the transmit link speed of the connection. [CHAR LIMIT=32] -->
		<string name="tx_wifi_speed">Transmit link speed</string>
		<!-- Label for the receive link speed of the connection. [CHAR LIMIT=32] -->
		<string name="rx_wifi_speed">Receive link speed</string>
		<!-- Label for the frequency band of the connection -->
		<string name="wifi_frequency">Frequency</string>
		<!-- Label for the IP address of the connection -->
		@@ -2389,7 +2393,10 @@
		<string name="networkid_label" translatable="false">Network ID:</string>
		<!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
		Label on Wifi Status screen-->
		<string name="link_speed_label" translatable="false">Link speed:</string>
		<string name="tx_link_speed_label" translatable="false">Transmit link speed:</string>
		<!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
		Label on Wifi Status screen-->
		<string name="rx_link_speed_label" translatable="false">Receive link speed:</string>
		<!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
		Label on Wifi Status screen-->
		<string name="scan_list_label" translatable="false">Scan results:</string>

res/xml/wifi_network_details_fragment.xml

+7 −2

Original line number	Diff line number	Diff line
		@@ -96,8 +96,13 @@
		android:selectable="false"
		settings:enableCopying="true"/>
		<Preference
		android:key="link_speed"
		android:title="@string/wifi_speed"
		android:key="tx_link_speed"
		android:title="@string/tx_wifi_speed"
		android:selectable="false"
		settings:enableCopying="true"/>
		<Preference
		android:key="rx_link_speed"
		android:title="@string/rx_wifi_speed"
		android:selectable="false"
		settings:enableCopying="true"/>
		</PreferenceCategory>

src/com/android/settings/wifi/WifiConfigController.java

+8 −3

Original line number	Diff line number	Diff line
		@@ -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) {

src/com/android/settings/wifi/WifiStatusTest.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -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()));