PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix layout for wifi setup xl

Browse Source 
- use 56dip instead of 48dip for TableRow's height
- enclose some Views to accomodate them well
  in TableRow
- use center_vertical instead of bottom to show
  TextView. Bottom texts looks weird with wider height.

Change-Id: I9c544cb4f2532e8ceb84a746fc22223ca1dce58c
This commit is contained in:
Daisuke Miyakawa
2011-03-07 17:58:01 -08:00
parent 4eb13d06b6
commit f82efaedce
2 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
res/layout/wifi_config_ui_for_setup_wizard.xml
View File

@@ -74,17 +74,19 @@
<!-- To accomodate @id/type into TableLayout, we splitted the layout into two: <!-- To accomodate @id/type into TableLayout, we splitted the layout into two:
@id/type_ssid and @id/type_security. --> @id/type_ssid and @id/type_security. -->
<TableRow android:id="@+id/type_ssid" <TableRow android:id="@+id/type_ssid"
android:minHeight="56dip"
android:visibility="gone"> android:visibility="gone">
<TextView android:id="@+id/ssid_text" <TextView android:id="@+id/ssid_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:minWidth="128dip" android:minWidth="128dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="48dip" android:minHeight="56dip"
android:paddingRight="16dip"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:text="@string/wifi_ssid" android:text="@string/wifi_ssid"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" android:textSize="20sp"
android:gravity="bottom"/> android:gravity="left|center_vertical" />
<FrameLayout android:id="@+id/ssid_layout" <FrameLayout android:id="@+id/ssid_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -102,58 +104,67 @@
</TableRow> </TableRow>
<TableRow android:id="@+id/security_fields" <TableRow android:id="@+id/security_fields"
android:minHeight="56dip"
android:visibility="gone"> android:visibility="gone">
<TextView android:id="@+id/password_text" <TextView android:id="@+id/password_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:minWidth="128dip" android:minWidth="128dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="48dip" android:minHeight="56dip"
android:text="@string/wifi_password" android:text="@string/wifi_password"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" android:textSize="20sp"
android:gravity="bottom" /> android:gravity="left|center_vertical" />
<FrameLayout android:id="@+id/password_layout" <LinearLayout android:id="@+id/password_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="48dip"> android:gravity="bottom">
<EditText android:id="@+id/password" <EditText android:id="@+id/password"
android:layout_width="368dip" android:layout_width="368dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="56dip"
android:singleLine="true" android:singleLine="true"
android:password="true" android:password="true"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" /> android:textSize="20sp" />
</FrameLayout> </LinearLayout>
<!-- It looks CheckBox isn't aligned well with TableRow -->
<FrameLayout android:layout_width="wrap_content"
android:layout_height="wrap_content">
<CheckBox android:id="@+id/show_password" <CheckBox android:id="@+id/show_password"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="56dip"
android:text="@string/wifi_show_password" android:text="@string/wifi_show_password"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" /> android:textSize="20sp" />
</FrameLayout>
</TableRow> </TableRow>
<TableRow android:id="@+id/type_security" <TableRow android:id="@+id/type_security"
android:minHeight="56dip"
android:visibility="gone"> android:visibility="gone">
<TextView android:id="@+id/security_text" <TextView android:id="@+id/security_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:minWidth="128dip" android:minWidth="128dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="48dip" android:minHeight="56dip"
android:text="@string/wifi_security" android:text="@string/wifi_security"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" android:textSize="20sp"
android:gravity="bottom"/> android:gravity="bottom"/>
<FrameLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom">
<Spinner android:id="@+id/security" <Spinner android:id="@+id/security"
android:layout_width="368dip" android:layout_width="368dip"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="48dip" android:minHeight="56dip"
android:paddingLeft="4dip" android:paddingLeft="4dip"/>
android:textAppearance="?android:attr/textAppearanceMedium" </FrameLayout>
android:textSize="20sp"
android:gravity="left|center_vertical"/>
</TableRow> </TableRow>
</TableLayout> </TableLayout>

2
res/layout/wifi_setup_custom_list_item_1.xml
View File

@@ -22,6 +22,6 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp" android:textSize="20sp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="10dip" android:paddingLeft="16dip"
android:minHeight="48dip" android:minHeight="48dip"
/> />