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:
@@ -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
|
<LinearLayout
|
||||||
android:textStyle="bold"
|
android:orientation="vertical"
|
||||||
android:maxLines="1"
|
android:paddingLeft="6dip"
|
||||||
android:layout_marginTop="8dip"
|
android:paddingRight="6dip"
|
||||||
android:layout_width="wrap_content" android:layout_height="wrap_content"
|
android:paddingBottom="3dip"
|
||||||
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:layout_width="match_parent" android:layout_height="wrap_content"
|
||||||
android:autoText="false"
|
android:scrollbars="vertical" >
|
||||||
android:capitalize="none"
|
|
||||||
android:scrollHorizontally="true" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:layout_marginTop="4dip"
|
android:layout_marginTop="8dip"
|
||||||
android:layout_width="wrap_content" android:layout_height="wrap_content"
|
android:layout_width="wrap_content" android:layout_height="wrap_content"
|
||||||
android:text="@string/proxy_port_label" />
|
android:text="@string/proxy_hostname_label" />
|
||||||
|
|
||||||
<EditText android:id="@+id/port"
|
<EditText android:id="@+id/hostname"
|
||||||
android:numeric="integer"
|
android:maxLines="1"
|
||||||
android:maxLines="1"
|
android:layout_marginTop="2dip"
|
||||||
android:layout_marginTop="2dip"
|
android:layout_width="match_parent" android:layout_height="wrap_content"
|
||||||
android:layout_width="match_parent" android:layout_height="wrap_content"
|
android:autoText="false"
|
||||||
android:scrollHorizontally="true" />
|
android:capitalize="none"
|
||||||
|
android:scrollHorizontally="true" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:layout_marginTop="4dip"
|
android:layout_marginTop="4dip"
|
||||||
android:layout_width="wrap_content" android:layout_height="wrap_content"
|
android:layout_width="wrap_content" android:layout_height="wrap_content"
|
||||||
android:text="@string/proxy_exclusionlist_label" />
|
android:text="@string/proxy_port_label" />
|
||||||
|
|
||||||
<EditText android:id="@+id/exclusionlist"
|
<EditText android:id="@+id/port"
|
||||||
android:maxLines="1"
|
android:numeric="integer"
|
||||||
android:layout_marginTop="2dip"
|
android:maxLines="1"
|
||||||
android:layout_width="match_parent" android:layout_height="wrap_content"
|
android:layout_marginTop="2dip"
|
||||||
android:autoText="false"
|
android:layout_width="match_parent" android:layout_height="wrap_content"
|
||||||
android:capitalize="none"
|
android:scrollHorizontally="true" />
|
||||||
android:singleLine="true"
|
|
||||||
android:scrollHorizontally="true" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<TextView
|
||||||
android:orientation="horizontal"
|
android:textStyle="bold"
|
||||||
android:paddingTop="8dip"
|
android:maxLines="1"
|
||||||
android:layout_width="wrap_content" android:layout_height="wrap_content">
|
android:layout_marginTop="4dip"
|
||||||
|
android:layout_width="wrap_content" android:layout_height="wrap_content"
|
||||||
|
android:text="@string/proxy_exclusionlist_label" />
|
||||||
|
|
||||||
<Button android:id="@+id/action"
|
<EditText android:id="@+id/exclusionlist"
|
||||||
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_action_text" />
|
android:layout_width="match_parent" android:layout_height="wrap_content"
|
||||||
|
android:autoText="false"
|
||||||
|
android:capitalize="none"
|
||||||
|
android:singleLine="true"
|
||||||
|
android:scrollHorizontally="true" />
|
||||||
|
|
||||||
<Button android:id="@+id/clear"
|
<LinearLayout
|
||||||
android:layout_width="wrap_content" android:layout_height="match_parent"
|
android:orientation="horizontal"
|
||||||
android:layout_weight="1"
|
android:paddingTop="8dip"
|
||||||
android:text="@string/proxy_clear_text" />
|
android:layout_width="wrap_content" android:layout_height="wrap_content">
|
||||||
|
|
||||||
<Button android:id="@+id/defaultView"
|
<Button android:id="@+id/action"
|
||||||
android:layout_width="wrap_content" android:layout_height="match_parent"
|
android:layout_width="wrap_content" android:layout_height="match_parent"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/proxy_defaultView_text" />
|
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>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user