Fix UI for WifiSettings for XL screen

Change-Id: I874e1e8d86e8b219414f6bf2ff945ea4f9ab7a6c

2 files changed, 32 insertions, 32 deletions

diff --git a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
index a6a8e8a..6aa825a 100644
--- a/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-xlarge/wifi_settings_for_setup_wizard_xl.xml
@@ -93,17 +93,19 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true">
 
-        <Button android:id="@+id/wifi_setup_connect"
+        <Button android:id="@+id/wifi_setup_forget"
                 android:layout_width="260dip"
                 android:layout_height="60dip"
                 android:textSize="24dip"
-                android:text="@string/wifi_connect"
+                android:text="@string/wifi_forget"
                 android:visibility="gone" />
-        <Button android:id="@+id/wifi_setup_forget"
+
+        <Button android:id="@+id/wifi_setup_connect"
                 android:layout_width="260dip"
                 android:layout_height="60dip"
+                android:layout_marginTop="20dip"
                 android:textSize="24dip"
-                android:text="@string/wifi_forget"
+                android:text="@string/wifi_connect"
                 android:visibility="gone" />
 
         <Button android:id="@+id/wifi_setup_add_network"
@@ -134,7 +136,6 @@
             android:layout_height="60dip"
             android:layout_above="@+id/wifi_setup_cancel"
             android:layout_alignLeft="@+id/wifi_setup_cancel"
-            android:layout_marginBottom="30dip"
             android:textSize="24dip"
             android:text="@string/wifi_detail"
             android:visibility="gone" />
@@ -142,6 +143,7 @@
     <Button android:id="@+id/wifi_setup_cancel"
             android:layout_width="260dip"
             android:layout_height="60dip"
+            android:layout_marginTop="20dip"
             android:layout_alignParentBottom="true"
             android:layout_toLeftOf="@id/right_buttons"
             android:textSize="24dip"
diff --git a/res/layout/wifi_config_preference2.xml b/res/layout/wifi_config_preference2.xml
index 29cb585..bbda2f9 100644
--- a/res/layout/wifi_config_preference2.xml
+++ b/res/layout/wifi_config_preference2.xml
@@ -56,7 +56,32 @@
                   android:layout_height="wrap_content"
                   android:text="@string/wifi_show_password" />
     </LinearLayout>
+    <LinearLayout android:id="@+id/type"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:orientation="vertical"
+                 android:visibility="gone">
+
+       <TextView android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                 android:text="@string/wifi_ssid" />
+
+       <EditText android:id="@+id/ssid"
+                 android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:singleLine="true"
+                 android:inputType="textNoSuggestions" />
 
+       <TextView android:layout_width="fill_parent"
+                 android:layout_height="wrap_content"
+                 android:text="@string/wifi_security" />
+
+       <Spinner android:id="@+id/security"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:prompt="@string/wifi_security"
+                android:entries="@array/wifi_security" />
+    </LinearLayout> <!-- android:id="@+id/type" -->
 
     <!-- All the views below are "gone".
          We want them as data storage, not as UI components. -->
@@ -109,33 +134,6 @@
                   android:inputType="textPassword" />
     </LinearLayout> -->
 
-    <LinearLayout android:id="@+id/type"
-                 android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
-                 android:orientation="vertical"
-                 android:visibility="gone">
-
-       <TextView android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                 android:text="@string/wifi_ssid" />
-
-       <EditText android:id="@+id/ssid"
-                 android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
-                 android:singleLine="true"
-                 android:inputType="textNoSuggestions" />
-
-       <TextView android:layout_width="fill_parent"
-                 android:layout_height="wrap_content"
-                 android:text="@string/wifi_security" />
-
-       <Spinner android:id="@+id/security"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:prompt="@string/wifi_security"
-                android:entries="@array/wifi_security" />
-    </LinearLayout> <!-- android:id="@+id/type" -->
-
     <!--  android:id="@+id/security_fields" -->
     <LinearLayout
                   android:layout_width="fill_parent"