diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2011-03-04 11:37:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-04 11:37:55 -0800 |
| commit | 834f4363cf8de3a8e22a0b61ba4d90a83aa072d4 (patch) | |
| tree | 86512c4ed95832c8e18c19a3ccaa3019e28e2194 /res | |
| parent | 89a2fc69f813832d45fd355611b5300f0e36eebb (diff) | |
| parent | d85ce3c9eacdf3a0b201a7756e8b423f32328584 (diff) | |
| download | packages_apps_settings-834f4363cf8de3a8e22a0b61ba4d90a83aa072d4.zip packages_apps_settings-834f4363cf8de3a8e22a0b61ba4d90a83aa072d4.tar.gz packages_apps_settings-834f4363cf8de3a8e22a0b61ba4d90a83aa072d4.tar.bz2 | |
am d85ce3c9: Put SSID field first.
* commit 'd85ce3c9eacdf3a0b201a7756e8b423f32328584':
Put SSID field first.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/wifi_config_ui_for_setup_wizard.xml | 55 |
1 files changed, 28 insertions, 27 deletions
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 --- 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" |