diff options
author | Amith Yamasani <yamasani@google.com> | 2010-12-08 11:12:23 -0800 |
---|---|---|
committer | Amith Yamasani <yamasani@google.com> | 2010-12-08 11:26:41 -0800 |
commit | 1c7e49ba670ad70822d34234e3677fef53e94569 (patch) | |
tree | 5086a5ddfe79db221e22c1fe7697dd269f308a2b | |
parent | 126f5ecf4f5e53c08b0b68a81c44bd9840fd0907 (diff) | |
download | packages_apps_Settings-1c7e49ba670ad70822d34234e3677fef53e94569.zip packages_apps_Settings-1c7e49ba670ad70822d34234e3677fef53e94569.tar.gz packages_apps_Settings-1c7e49ba670ad70822d34234e3677fef53e94569.tar.bz2 |
Beautify WiFi dialog layout for x-large
Bug: 3237631
Change-Id: Ibc70008b345fc3f7213ea2db1e6ec2ddb66a1d53
-rw-r--r-- | res/layout/wifi_dialog.xml | 474 | ||||
-rw-r--r-- | res/layout/wifi_dialog_row.xml | 15 | ||||
-rw-r--r-- | res/values-xlarge/styles.xml | 30 | ||||
-rw-r--r-- | res/values/styles.xml | 29 |
4 files changed, 273 insertions, 275 deletions
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml index 0aa8aa3..25ad510 100644 --- a/res/layout/wifi_dialog.xml +++ b/res/layout/wifi_dialog.xml @@ -15,57 +15,42 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="300sp" + android:layout_width="wrap_content" android:layout_height="wrap_content"> <LinearLayout - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="8dip" android:orientation="vertical"> <LinearLayout android:id="@+id/info" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> + style="@style/wifi_section" /> <LinearLayout android:id="@+id/setup_fields" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" + style="@style/wifi_item" android:visibility="gone"> <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" + style="@style/wifi_item_label" android:text="@string/wifi_network_setup" /> <Spinner android:id="@+id/network_setup" - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/wifi_item_content" android:prompt="@string/wifi_network_setup" android:entries="@array/wifi_network_setup" /> </LinearLayout> <LinearLayout android:id="@+id/wps_fields" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" + style="@style/wifi_item" android:visibility="gone"> <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" + style="@style/wifi_item_label" android:text="@string/wifi_wps_pin" /> <EditText android:id="@+id/wps_pin" - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/wifi_item_content" android:singleLine="true" android:inputType="textPassword" /> @@ -73,301 +58,262 @@ <LinearLayout android:id="@+id/type" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" + style="@style/wifi_section" android:visibility="gone"> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/wifi_ssid" /> - - <EditText android:id="@+id/ssid" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_ssid" /> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/wifi_security" /> - - <Spinner android:id="@+id/security" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_security" - android:entries="@array/wifi_security" /> + <EditText android:id="@+id/ssid" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> + + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_content" + android:text="@string/wifi_security" /> + + <Spinner android:id="@+id/security" + style="@style/wifi_item_content" + android:prompt="@string/wifi_security" + android:entries="@array/wifi_security" /> + </LinearLayout> </LinearLayout> <LinearLayout android:id="@+id/security_fields" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" + style="@style/wifi_section" android:visibility="gone"> <LinearLayout android:id="@+id/eap" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" + style="@style/wifi_section" android:visibility="gone"> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dip" - android:text="@string/wifi_eap_method" /> - - <Spinner android:id="@+id/method" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_eap_method" - android:entries="@array/wifi_eap_method" /> - - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/please_select_phase2" /> - - <Spinner android:id="@+id/phase2" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:prompt="@string/please_select_phase2" - android:entries="@array/wifi_phase2_entries" /> - - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dip" - android:text="@string/wifi_eap_ca_cert" /> - - <Spinner android:id="@+id/ca_cert" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_eap_ca_cert" /> - - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dip" - android:text="@string/wifi_eap_user_cert" /> - - <Spinner android:id="@+id/user_cert" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:prompt="@string/wifi_eap_user_cert" /> + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_eap_method" /> + + <Spinner android:id="@+id/method" + style="@style/wifi_item_content" + android:prompt="@string/wifi_eap_method" + android:entries="@array/wifi_eap_method" /> + </LinearLayout> + + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/please_select_phase2" /> + + <Spinner android:id="@+id/phase2" + style="@style/wifi_item_content" + android:prompt="@string/please_select_phase2" + android:entries="@array/wifi_phase2_entries" /> + </LinearLayout> + + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_eap_ca_cert" /> + + <Spinner android:id="@+id/ca_cert" + style="@style/wifi_item_content" + android:prompt="@string/wifi_eap_ca_cert" /> + </LinearLayout> + + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_eap_user_cert" /> + + <Spinner android:id="@+id/user_cert" + style="@style/wifi_item_content" + android:prompt="@string/wifi_eap_user_cert" /> + </LinearLayout> + + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_eap_identity" /> + + <EditText android:id="@+id/identity" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> + + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_eap_anonymous" /> + + <EditText android:id="@+id/anonymous" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> + </LinearLayout> + <LinearLayout + style="@style/wifi_item" > <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dip" - android:text="@string/wifi_eap_identity" /> - - <EditText android:id="@+id/identity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> + style="@style/wifi_item_label" + android:text="@string/wifi_password" /> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dip" - android:text="@string/wifi_eap_anonymous" /> - - <EditText android:id="@+id/anonymous" - android:layout_width="match_parent" - android:layout_height="wrap_content" + <EditText android:id="@+id/password" + style="@style/wifi_item_content" android:singleLine="true" - android:inputType="textNoSuggestions" /> + android:password="true" /> </LinearLayout> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dip" - android:text="@string/wifi_password" /> - - <EditText android:id="@+id/password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:password="true" /> + <LinearLayout + style="@style/wifi_item" > + <!-- Dummy to enable right-justification of checkbox --> + <TextView + style="@style/wifi_item_label" /> - <CheckBox android:id="@+id/show_password" - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" + <CheckBox android:id="@+id/show_password" + style="@style/wifi_item_content" android:text="@string/wifi_show_password" /> + </LinearLayout> </LinearLayout> <LinearLayout android:id="@+id/ip_fields" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" + style="@style/wifi_item" android:visibility="gone"> <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" + style="@style/wifi_item_label" android:text="@string/wifi_ip_settings" /> <Spinner android:id="@+id/ip_settings" - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/wifi_item_content" android:prompt="@string/wifi_ip_settings" android:entries="@array/wifi_ip_settings" /> </LinearLayout> <LinearLayout android:id="@+id/staticip" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" + style="@style/wifi_section" android:visibility="gone"> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/wifi_ip_address" /> - - <EditText android:id="@+id/ipaddress" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_ip_address" /> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/wifi_gateway" /> - - <EditText android:id="@+id/gateway" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> + <EditText android:id="@+id/ipaddress" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> + + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_gateway" /> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/wifi_network_prefix_length" /> - - <EditText android:id="@+id/network_prefix_length" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> + <EditText android:id="@+id/gateway" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/wifi_dns1" /> - - <EditText android:id="@+id/dns1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_network_prefix_length" /> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/wifi_dns2" /> - - <EditText android:id="@+id/dns2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> + <EditText android:id="@+id/network_prefix_length" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_dns1" /> + <EditText android:id="@+id/dns1" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> + + <LinearLayout + style="@style/wifi_item" > + <TextView + style="@style/wifi_item_label" + android:text="@string/wifi_dns2" /> + + <EditText android:id="@+id/dns2" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> </LinearLayout> + <LinearLayout android:id="@+id/proxy_settings_fields" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" + style="@style/wifi_item" android:visibility="gone"> <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" + style="@style/wifi_item_label" android:text="@string/proxy_settings_title" /> <Spinner android:id="@+id/proxy_settings" - android:layout_width="match_parent" - android:layout_height="wrap_content" + style="@style/wifi_item_content" android:prompt="@string/proxy_settings_title" android:entries="@array/wifi_proxy_settings" /> </LinearLayout> <LinearLayout android:id="@+id/proxy_fields" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" + style="@style/wifi_section" android:visibility="gone"> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/proxy_hostname_label" /> - - <EditText android:id="@+id/proxy_hostname" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/proxy_port_label" /> - - <EditText android:id="@+id/proxy_port" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> - <TextView - style="?android:attr/textAppearanceSmall" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dip" - android:text="@string/proxy_exclusionlist_label" /> - - <EditText android:id="@+id/proxy_exclusionlist" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="true" - android:inputType="textNoSuggestions" /> + <LinearLayout style="@style/wifi_item"> + <TextView + style="@style/wifi_item_label" + android:text="@string/proxy_hostname_label" /> + <EditText android:id="@+id/proxy_hostname" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> + <LinearLayout style="@style/wifi_item"> + <TextView + style="@style/wifi_item_label" + android:text="@string/proxy_port_label" /> + + <EditText android:id="@+id/proxy_port" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> + <LinearLayout style="@style/wifi_item"> + <TextView + style="@style/wifi_item_label" + android:text="@string/proxy_exclusionlist_label" /> + + <EditText android:id="@+id/proxy_exclusionlist" + style="@style/wifi_item_content" + android:singleLine="true" + android:inputType="textNoSuggestions" /> + </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/res/layout/wifi_dialog_row.xml b/res/layout/wifi_dialog_row.xml index 757d975..7ca2e5c 100644 --- a/res/layout/wifi_dialog_row.xml +++ b/res/layout/wifi_dialog_row.xml @@ -15,18 +15,13 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + style="@style/wifi_item" > <TextView - android:id="@+id/name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="8dip" - android:textAppearance="?android:attr/textAppearanceSmall" /> + style="@style/wifi_item_label" + android:id="@+id/name" /> + <TextView android:id="@+id/value" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" + style="@style/wifi_item_content" android:textStyle="bold" /> </LinearLayout> diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml index a3ac46f..5e3fead 100644 --- a/res/values-xlarge/styles.xml +++ b/res/values-xlarge/styles.xml @@ -20,4 +20,34 @@ <item name="android:windowNoTitle">true</item> </style> + <style name="wifi_item"> + <item name="android:layout_width">560dip</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_marginTop">8dip</item> + <item name="android:layout_marginLeft">32dip</item> + <item name="android:layout_marginRight">32dip</item> + <item name="android:orientation">horizontal</item> + <item name="android:gravity">center_vertical</item> + </style> + + <style name="wifi_item_label"> + <item name="android:layout_width">0dip</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_weight">3</item> + <item name="android:textSize">18sp</item> + </style> + + <style name="wifi_item_content"> + <item name="android:layout_width">0dip</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_weight">7</item> + <item name="android:textSize">18sp</item> + </style> + + <style name="wifi_section"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:orientation">vertical</item> + </style> + </resources>
\ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index 991637b..969742f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -81,5 +81,32 @@ <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge"> </style> - + + <style name="wifi_item"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:layout_marginTop">8dip</item> + <item name="android:layout_marginLeft">16dip</item> + <item name="android:layout_marginRight">16dip</item> + <item name="android:orientation">vertical</item> + <item name="android:gravity">left</item> + </style> + + <style name="wifi_item_label"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:textSize">14sp</item> + </style> + + <style name="wifi_item_content"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:textSize">18sp</item> + </style> + + <style name="wifi_section"> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:orientation">vertical</item> + </style> </resources> |