Add a scroll view to proxy settings so that it isn't obscured by the keyboard.

Bug: 3267408
Change-Id: I06ab34538a741aa76301048ccbeb80a6e70219f3
This commit is contained in:
Amith Yamasani
2010-12-17 12:08:43 -08:00
parent 22c4b39e06
commit 57acae3058

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
/* //device/apps/Browser/res/layout/proxy.xml /*
** **
** Copyright 2006, The Android Open Source Project ** Copyright 2006, The Android Open Source Project
** **
@@ -17,79 +17,83 @@
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:paddingLeft="6dip" android:layout_height="match_parent" >
android:paddingRight="6dip"
android:paddingBottom="3dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" >
<TextView
android:textStyle="bold"
android:maxLines="1"
android:layout_marginTop="8dip"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="@string/proxy_hostname_label" />
<EditText android:id="@+id/hostname"
android:maxLines="1"
android:layout_marginTop="2dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:autoText="false"
android:capitalize="none"
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_port_label" />
<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 <LinearLayout
android:orientation="horizontal" android:orientation="vertical"
android:paddingTop="8dip" android:paddingLeft="6dip"
android:layout_width="wrap_content" android:layout_height="wrap_content"> android:paddingRight="6dip"
android:paddingBottom="3dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" >
<Button android:id="@+id/action" <TextView
android:layout_width="wrap_content" android:layout_height="match_parent" android:textStyle="bold"
android:layout_weight="1" android:maxLines="1"
android:text="@string/proxy_action_text" /> android:layout_marginTop="8dip"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="@string/proxy_hostname_label" />
<Button android:id="@+id/clear" <EditText android:id="@+id/hostname"
android:layout_width="wrap_content" android:layout_height="match_parent" android:maxLines="1"
android:layout_weight="1" android:layout_marginTop="2dip"
android:text="@string/proxy_clear_text" /> android:layout_width="match_parent" android:layout_height="wrap_content"
android:autoText="false"
android:capitalize="none"
android:scrollHorizontally="true" />
<Button android:id="@+id/defaultView" <TextView
android:layout_width="wrap_content" android:layout_height="match_parent" android:textStyle="bold"
android:layout_weight="1" android:maxLines="1"
android:text="@string/proxy_defaultView_text" /> android:layout_marginTop="4dip"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:text="@string/proxy_port_label" />
<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
android:orientation="horizontal"
android:paddingTop="8dip"
android:layout_width="wrap_content" android:layout_height="wrap_content">
<Button android:id="@+id/action"
android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/proxy_action_text" />
<Button android:id="@+id/clear"
android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/proxy_clear_text" />
<Button android:id="@+id/defaultView"
android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_weight="1"
android:text="@string/proxy_defaultView_text" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </ScrollView>