summaryrefslogtreecommitdiffstats
path: root/res/layout/proxy.xml
diff options
context:
space:
mode:
authorOscar Montemayor <oam@google.com>2010-08-03 16:56:09 -0700
committerOscar Montemayor <oam@google.com>2010-08-04 14:52:21 -0700
commit05411893af4afc4bf7b8530d787c5b9e0bbeed39 (patch)
tree8043dab214c6248349d328fd418588887d83327b /res/layout/proxy.xml
parent3d9d445abaa64416319c4837ed6e2daa58e5dc28 (diff)
downloadpackages_apps_Settings-05411893af4afc4bf7b8530d787c5b9e0bbeed39.zip
packages_apps_Settings-05411893af4afc4bf7b8530d787c5b9e0bbeed39.tar.gz
packages_apps_Settings-05411893af4afc4bf7b8530d787c5b9e0bbeed39.tar.bz2
Enabling users toset the Global Proxy from wireless settings.
Change-Id: Ie9b37e4c8e042fab738d2181878e93d7d2645834
Diffstat (limited to 'res/layout/proxy.xml')
-rw-r--r--res/layout/proxy.xml21
1 files changed, 19 insertions, 2 deletions
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