commit 5d318687358a5bb4da58f7094a91eb20a6291c57
author Irfan Sheriff <isheriff@google.com> Wed Mar 02 14:39:32 2011 -0800
committer Irfan Sheriff <isheriff@google.com> Thu Mar 03 14:32:47 2011 -0800
tree 7771bf8fcbbcfd1b7cfaf21a8292021e8cab7e6a
parent 89abc19eb05d80e52f61d079bf4476c74c0d85c4

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: I478c915b245592d4738c7d7da2ca1485a247ed39

res/layout/wifi_config_preference.xml

diff --git a/res/layout/wifi_config_preference.xml b/res/layout/wifi_config_preference.xml
index f19a9ec..6103fb9 100644
--- a/res/layout/wifi_config_preference.xml
+++ b/res/layout/wifi_config_preference.xml
@@ -232,6 +232,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
+                    android:inputType="textNoSuggestions"
                     android:hint="@string/proxy_hostname_hint" />
 
             <TextView android:layout_width="fill_parent"
@@ -242,6 +243,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
+                    android:inputType="number"
                     android:hint="@string/proxy_port_hint" />
 
             <TextView android:layout_width="fill_parent"
@@ -252,6 +254,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
+                    android:inputType="textNoSuggestions"
                     android:hint="@string/proxy_exclusionlist_hint" />
 
         </LinearLayout>
@@ -288,6 +291,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
+                android:hint="wifi_ip_address_hint"
                 android:inputType="textNoSuggestions" />
 
             <TextView
@@ -299,6 +303,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
+                android:hint="wifi_gateway_hint"
                 android:inputType="textNoSuggestions" />
 
             <TextView
@@ -310,7 +315,8 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
-                android:inputType="textNoSuggestions" />
+                android:hint="wifi_network_prefix_length_hint"
+                android:inputType="number" />
 
             <TextView
                 android:layout_width="fill_parent"
@@ -321,6 +327,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
+                android:hint="wifi_dns1_hint"
                 android:inputType="textNoSuggestions" />
 
             <TextView
@@ -332,6 +339,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
+                android:hint="wifi_dns2_hint"
                 android:inputType="textNoSuggestions" />
     </LinearLayout>