auto import from //depot/cupcake/@135843
diff --git a/res/layout/proxy.xml b/res/layout/proxy.xml
new file mode 100644
index 0000000..914d0ea
--- /dev/null
+++ b/res/layout/proxy.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/Browser/res/layout/proxy.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** 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="fill_parent" android:layout_height="wrap_content">
+
+ <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="fill_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="fill_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">
+
+ <Button android:id="@+id/action"
+ android:layout_width="wrap_content" android:layout_height="fill_parent"
+ android:layout_weight="1"
+ android:text="@string/proxy_action_text" />
+
+ <Button android:id="@+id/clear"
+ android:layout_width="wrap_content" android:layout_height="fill_parent"
+ android:layout_weight="1"
+ android:text="@string/proxy_clear_text" />
+
+ <Button android:id="@+id/defaultView"
+ android:layout_width="wrap_content" android:layout_height="fill_parent"
+ android:layout_weight="1"
+ android:text="@string/proxy_defaultView_text" />
+
+ </LinearLayout>
+</LinearLayout>
+