Put SSID field first.

[android-x86/packages-apps-Settings.git] / res / layout / wifi_config_ui_for_setup_wizard.xml

diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index dc3d185..b0f0bb2 100644 (file)
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -71,68 +71,69 @@
     <TableLayout android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  android:layout_marginBottom="16dip">
-        <TableRow android:id="@+id/security_fields"
+        <!-- To accomodate @id/type into TableLayout, we splitted the layout into two:
+             @id/type_ssid and @id/type_security. -->
+        <TableRow android:id="@+id/type_ssid"
                   android:visibility="gone">
-            <TextView android:id="@+id/password_text"
+            <TextView android:id="@+id/ssid_text"
                       android:layout_width="wrap_content"
                       android:minWidth="128dip"
                       android:layout_height="wrap_content"
                       android:minHeight="48dip"
-                      android:text="@string/wifi_password"
+                      android:layout_alignParentLeft="true"
+                      android:text="@string/wifi_ssid"
                       android:textAppearance="?android:attr/textAppearanceMedium"
                       android:textSize="20sp"
-                      android:gravity="bottom" />
+                      android:gravity="bottom"/>
 
-            <FrameLayout android:id="@+id/password_layout"
+            <FrameLayout android:id="@+id/ssid_layout"
                          android:layout_width="wrap_content"
                          android:layout_height="wrap_content"
-                         android:minHeight="48dip">
-                <EditText android:id="@+id/password"
+                         android:layout_alignBottom="@id/ssid_text"
+                         android:layout_toRightOf="@id/ssid_text">
+                <EditText android:id="@+id/ssid"
                           android:layout_width="368dip"
                           android:layout_height="wrap_content"
                           android:singleLine="true"
-                          android:password="true"
+                          android:inputType="textNoSuggestions"
                           android:textAppearance="?android:attr/textAppearanceMedium"
                           android:textSize="20sp" />
             </FrameLayout>
-
-            <CheckBox android:id="@+id/show_password"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:text="@string/wifi_show_password"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textSize="20sp" />
         </TableRow>
 
-        <!-- To accomodate @id/type into TableLayout, we splitted the layout into two:
-             @id/type_ssid and @id/type_security. -->
-        <TableRow android:id="@+id/type_ssid"
+        <TableRow android:id="@+id/security_fields"
                   android:visibility="gone">
-            <TextView android:id="@+id/ssid_text"
+            <TextView android:id="@+id/password_text"
                       android:layout_width="wrap_content"
                       android:minWidth="128dip"
                       android:layout_height="wrap_content"
                       android:minHeight="48dip"
-                      android:layout_alignParentLeft="true"
-                      android:text="@string/wifi_ssid"
+                      android:text="@string/wifi_password"
                       android:textAppearance="?android:attr/textAppearanceMedium"
                       android:textSize="20sp"
-                      android:gravity="bottom"/>
+                      android:gravity="bottom" />
 
-            <FrameLayout android:id="@+id/ssid_layout"
+            <FrameLayout android:id="@+id/password_layout"
                          android:layout_width="wrap_content"
                          android:layout_height="wrap_content"
-                         android:layout_alignBottom="@id/ssid_text"
-                         android:layout_toRightOf="@id/ssid_text">
-                <EditText android:id="@+id/ssid"
+                         android:minHeight="48dip">
+                <EditText android:id="@+id/password"
                           android:layout_width="368dip"
                           android:layout_height="wrap_content"
                           android:singleLine="true"
-                          android:inputType="textNoSuggestions"
+                          android:password="true"
                           android:textAppearance="?android:attr/textAppearanceMedium"
                           android:textSize="20sp" />
             </FrameLayout>
+
+            <CheckBox android:id="@+id/show_password"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content"
+                      android:text="@string/wifi_show_password"
+                      android:textAppearance="?android:attr/textAppearanceMedium"
+                      android:textSize="20sp" />
         </TableRow>
+
         <TableRow android:id="@+id/type_security"
                   android:visibility="gone">
             <TextView android:id="@+id/security_text"