commit 05411893af4afc4bf7b8530d787c5b9e0bbeed39
author Oscar Montemayor <oam@google.com> Tue Aug 03 16:56:09 2010 -0700
committer Oscar Montemayor <oam@google.com> Wed Aug 04 14:52:21 2010 -0700
tree 8043dab214c6248349d328fd418588887d83327b
parent 3d9d445abaa64416319c4837ed6e2daa58e5dc28

Enabling users toset the Global Proxy from wireless settings.

Change-Id: Ie9b37e4c8e042fab738d2181878e93d7d2645834

res/layout/proxy.xml

diff --git a/res/layout/proxy.xml b/res/layout/proxy.xml
index 3ecbb80..76f200e 100644
--- a/res/layout/proxy.xml
+++ b/res/layout/proxy.xml
@@ -22,7 +22,8 @@
     android:paddingLeft="6dip"
     android:paddingRight="6dip"
     android:paddingBottom="3dip"
-    android:layout_width="match_parent" android:layout_height="wrap_content">
+    android:layout_width="match_parent" android:layout_height="wrap_content"
+    android:scrollbars="vertical" >
 
     <TextView
         android:textStyle="bold"
@@ -46,11 +47,27 @@
         android:layout_width="wrap_content" android:layout_height="wrap_content"
         android:text="@string/proxy_port_label" />
 
-    <EditText android:id="@+id/port" 
+    <EditText android:id="@+id/port"
         android:numeric="integer"
+        android:maxLines="1"
+        android:layout_marginTop="2dip"
+        android:layout_width="match_parent" android:layout_height="wrap_content"
+        android:scrollHorizontally="true" />
+
+    <TextView
+        android:textStyle="bold"
+        android:maxLines="1"
+        android:layout_marginTop="4dip"
+        android:layout_width="wrap_content" android:layout_height="wrap_content"
+        android:text="@string/proxy_exclusionlist_label" />
+
+    <EditText android:id="@+id/exclusionlist"
         android:maxLines="1" 
         android:layout_marginTop="2dip"
         android:layout_width="match_parent" android:layout_height="wrap_content"
+        android:autoText="false"
+        android:capitalize="none"
+        android:singleLine="true"
         android:scrollHorizontally="true" />
 
     <LinearLayout