DO NOT MERGE Proxy and IP fixes

Fix dual display of IP addresses for static IP
Fix inputType for proxy and IP fields
Add hint texts for IP fields

Change-Id: I5b556a07c2a5b69ecec959c933f2872e70496946
This commit is contained in:
Irfan Sheriff
2011-03-02 14:39:32 -08:00
committed by Irfan SHeriff
parent d61737b560
commit 00615cf5dc
4 changed files with 32 additions and 7 deletions

View File

@@ -1092,6 +1092,8 @@
<string name="wifi_speed">Link speed</string>
<!-- Label for the IP address of the connection -->
<string name="wifi_ip_address">IP address</string>
<!-- Hint text for the IP address [CHAR LIMIT=25]-->
<string name="wifi_ip_address_hint">192.168.1.128</string>
<!-- Label for the EAP method of the network -->
<string name="wifi_eap_method">EAP method</string>
<!-- Label for the phase2 -->
@@ -1171,12 +1173,20 @@
<string name="wifi_ip_settings_invalid_network_prefix_length">Please type a network prefix length between 0 and 32.</string>
<!-- Label for the DNS (first one) -->
<string name="wifi_dns1">DNS 1</string>
<!-- Hint text for DNS [CHAR LIMIT=25]-->
<string name="wifi_dns1_hint">8.8.8.8</string>
<!-- Label for the DNS (second one)-->
<string name="wifi_dns2">DNS 2</string>
<!-- Hint text for DNS [CHAR LIMIT=25]-->
<string name="wifi_dns2_hint">4.4.4.4</string>
<!-- Label for the gateway of the network -->
<string name="wifi_gateway">Gateway</string>
<!-- Hint text for the gateway [CHAR LIMIT=25]-->
<string name="wifi_gateway_hint">192.168.1.1</string>
<!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
<string name="wifi_network_prefix_length">Network prefix length</string>
<!-- Hint text for network prefix length [CHAR LIMIT=25] -->
<string name="wifi_network_prefix_length_hint">24</string>
<!-- Wifi AP settings-->
<!-- Label for wifi tether checkbox. Toggles Access Point on/off -->