PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Amith Yamasani
2010-12-17 12:10:56 -08:00
committed by Android (Google) Code Review
parent 043bcc04f3 57acae3058
commit 7154487da6
1 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
res/layout/proxy.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* //device/apps/Browser/res/layout/proxy.xml
/*
**
** Copyright 2006, The Android Open Source Project
**
@@ -17,79 +17,83 @@
** limitations under the License.
*/
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:paddingBottom="3dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" >
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<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"
<LinearLayout
android:orientation="vertical"
android:paddingLeft="6dip"
android:paddingRight="6dip"
android:paddingBottom="3dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:autoText="false"
android:capitalize="none"
android:scrollHorizontally="true" />
android:scrollbars="vertical" >
<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" />
<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/port"
android:numeric="integer"
android:maxLines="1"
android:layout_marginTop="2dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollHorizontally="true" />
<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_exclusionlist_label" />
<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/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" />
<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" />
<LinearLayout
android:orientation="horizontal"
android:paddingTop="8dip"
android:layout_width="wrap_content" android:layout_height="wrap_content">
<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" />
<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" />
<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" />
<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" />
<LinearLayout
android:orientation="horizontal"
android:paddingTop="8dip"
android:layout_width="wrap_content" android:layout_height="wrap_content">
<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" />
<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>
</ScrollView>