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

res/layout/proxy.xml

@@ -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,7 +17,11 @@
 ** 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:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
         android:orientation="vertical"
         android:paddingLeft="6dip"
         android:paddingRight="6dip"
@@ -92,4 +96,4 @@
 
         </LinearLayout>
     </LinearLayout>
-    
+</ScrollView>