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

Beautify WiFi dialog layout for x-large

Browse Source 
Bug: 3237631
Change-Id: Ibc70008b345fc3f7213ea2db1e6ec2ddb66a1d53
This commit is contained in:
Amith Yamasani
2010-12-08 11:12:23 -08:00
parent 126f5ecf4f
commit 1c7e49ba67
4 changed files with 260 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

444
res/layout/wifi_dialog.xml
View File

@@ -15,57 +15,42 @@
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="300sp" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dip"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout android:id="@+id/info" <LinearLayout android:id="@+id/info"
android:layout_width="match_parent" style="@style/wifi_section" />
android:layout_height="wrap_content"
android:orientation="vertical" />
<LinearLayout android:id="@+id/setup_fields" <LinearLayout android:id="@+id/setup_fields"
android:layout_width="match_parent" style="@style/wifi_item"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
style="?android:attr/textAppearanceSmall" style="@style/wifi_item_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/wifi_network_setup" /> android:text="@string/wifi_network_setup" />
<Spinner android:id="@+id/network_setup" <Spinner android:id="@+id/network_setup"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content"
android:prompt="@string/wifi_network_setup" android:prompt="@string/wifi_network_setup"
android:entries="@array/wifi_network_setup" /> android:entries="@array/wifi_network_setup" />
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/wps_fields" <LinearLayout android:id="@+id/wps_fields"
android:layout_width="match_parent" style="@style/wifi_item"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
style="?android:attr/textAppearanceSmall" style="@style/wifi_item_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/wifi_wps_pin" /> android:text="@string/wifi_wps_pin" />
<EditText android:id="@+id/wps_pin" <EditText android:id="@+id/wps_pin"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:inputType="textPassword" /> android:inputType="textPassword" />
@@ -73,301 +58,262 @@
<LinearLayout android:id="@+id/type" <LinearLayout android:id="@+id/type"
android:layout_width="match_parent" style="@style/wifi_section"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="8dip" android:text="@string/wifi_ssid" />
android:text="@string/wifi_ssid" />
<EditText android:id="@+id/ssid" <EditText android:id="@+id/ssid"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:singleLine="true"
android:singleLine="true" android:inputType="textNoSuggestions" />
android:inputType="textNoSuggestions" /> </LinearLayout>
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_content"
android:layout_marginTop="8dip" android:text="@string/wifi_security" />
android:text="@string/wifi_security" />
<Spinner android:id="@+id/security" <Spinner android:id="@+id/security"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:prompt="@string/wifi_security"
android:prompt="@string/wifi_security" android:entries="@array/wifi_security" />
android:entries="@array/wifi_security" /> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/security_fields" <LinearLayout android:id="@+id/security_fields"
android:layout_width="match_parent" style="@style/wifi_section"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<LinearLayout android:id="@+id/eap" <LinearLayout android:id="@+id/eap"
android:layout_width="match_parent" style="@style/wifi_section"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="4dip" android:text="@string/wifi_eap_method" />
android:text="@string/wifi_eap_method" />
<Spinner android:id="@+id/method" <Spinner android:id="@+id/method"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:prompt="@string/wifi_eap_method"
android:prompt="@string/wifi_eap_method" android:entries="@array/wifi_eap_method" />
android:entries="@array/wifi_eap_method" /> </LinearLayout>
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="fill_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="8dip" android:text="@string/please_select_phase2" />
android:text="@string/please_select_phase2" />
<Spinner android:id="@+id/phase2" <Spinner android:id="@+id/phase2"
android:layout_width="fill_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:prompt="@string/please_select_phase2"
android:prompt="@string/please_select_phase2" android:entries="@array/wifi_phase2_entries" />
android:entries="@array/wifi_phase2_entries" /> </LinearLayout>
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="4dip" android:text="@string/wifi_eap_ca_cert" />
android:text="@string/wifi_eap_ca_cert" />
<Spinner android:id="@+id/ca_cert" <Spinner android:id="@+id/ca_cert"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:prompt="@string/wifi_eap_ca_cert" />
android:prompt="@string/wifi_eap_ca_cert" /> </LinearLayout>
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="4dip" android:text="@string/wifi_eap_user_cert" />
android:text="@string/wifi_eap_user_cert" />
<Spinner android:id="@+id/user_cert" <Spinner android:id="@+id/user_cert"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:prompt="@string/wifi_eap_user_cert" />
android:prompt="@string/wifi_eap_user_cert" /> </LinearLayout>
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="4dip" android:text="@string/wifi_eap_identity" />
android:text="@string/wifi_eap_identity" />
<EditText android:id="@+id/identity" <EditText android:id="@+id/identity"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:singleLine="true"
android:singleLine="true" android:inputType="textNoSuggestions" />
android:inputType="textNoSuggestions" /> </LinearLayout>
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="4dip" android:text="@string/wifi_eap_anonymous" />
android:text="@string/wifi_eap_anonymous" />
<EditText android:id="@+id/anonymous" <EditText android:id="@+id/anonymous"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:singleLine="true"
android:singleLine="true" android:inputType="textNoSuggestions" />
android:inputType="textNoSuggestions" /> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="4dip" android:text="@string/wifi_password" />
android:text="@string/wifi_password" />
<EditText android:id="@+id/password" <EditText android:id="@+id/password"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:singleLine="true"
android:singleLine="true" android:password="true" />
android:password="true" /> </LinearLayout>
<CheckBox android:id="@+id/show_password" <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <!-- Dummy to enable right-justification of checkbox -->
android:layout_height="wrap_content" <TextView
style="@style/wifi_item_label" />
<CheckBox android:id="@+id/show_password"
style="@style/wifi_item_content"
android:text="@string/wifi_show_password" /> android:text="@string/wifi_show_password" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/ip_fields" <LinearLayout android:id="@+id/ip_fields"
android:layout_width="match_parent" style="@style/wifi_item"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
style="?android:attr/textAppearanceSmall" style="@style/wifi_item_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/wifi_ip_settings" /> android:text="@string/wifi_ip_settings" />
<Spinner android:id="@+id/ip_settings" <Spinner android:id="@+id/ip_settings"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content"
android:prompt="@string/wifi_ip_settings" android:prompt="@string/wifi_ip_settings"
android:entries="@array/wifi_ip_settings" /> android:entries="@array/wifi_ip_settings" />
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/staticip" <LinearLayout android:id="@+id/staticip"
android:layout_width="match_parent" style="@style/wifi_section"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="8dip" android:text="@string/wifi_ip_address" />
android:text="@string/wifi_ip_address" />
<EditText android:id="@+id/ipaddress" <EditText android:id="@+id/ipaddress"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:singleLine="true"
android:singleLine="true" android:inputType="textNoSuggestions" />
android:inputType="textNoSuggestions" /> </LinearLayout>
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="8dip" android:text="@string/wifi_gateway" />
android:text="@string/wifi_gateway" />
<EditText android:id="@+id/gateway" <EditText android:id="@+id/gateway"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:singleLine="true"
android:singleLine="true" android:inputType="textNoSuggestions" />
android:inputType="textNoSuggestions" /> </LinearLayout>
<TextView <LinearLayout
style="?android:attr/textAppearanceSmall" style="@style/wifi_item" >
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" style="@style/wifi_item_label"
android:layout_marginTop="8dip" android:text="@string/wifi_network_prefix_length" />
android:text="@string/wifi_network_prefix_length" />
<EditText android:id="@+id/network_prefix_length" <EditText android:id="@+id/network_prefix_length"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:singleLine="true"
android:singleLine="true" android:inputType="textNoSuggestions" />
android:inputType="textNoSuggestions" /> </LinearLayout>
<LinearLayout
style="@style/wifi_item" >
<TextView
style="@style/wifi_item_label"
android:text="@string/wifi_dns1" />
<TextView <EditText android:id="@+id/dns1"
style="?android:attr/textAppearanceSmall" style="@style/wifi_item_content"
android:layout_width="match_parent" android:singleLine="true"
android:layout_height="wrap_content" android:inputType="textNoSuggestions" />
android:layout_marginTop="8dip" </LinearLayout>
android:text="@string/wifi_dns1" />
<EditText android:id="@+id/dns1" <LinearLayout
android:layout_width="match_parent" style="@style/wifi_item" >
android:layout_height="wrap_content" <TextView
android:singleLine="true" style="@style/wifi_item_label"
android:inputType="textNoSuggestions" /> android:text="@string/wifi_dns2" />
<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/dns2"
style="@style/wifi_item_content"
android:singleLine="true"
android:inputType="textNoSuggestions" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/proxy_settings_fields" <LinearLayout android:id="@+id/proxy_settings_fields"
android:layout_width="match_parent" style="@style/wifi_item"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
style="?android:attr/textAppearanceSmall" style="@style/wifi_item_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
android:text="@string/proxy_settings_title" /> android:text="@string/proxy_settings_title" />
<Spinner android:id="@+id/proxy_settings" <Spinner android:id="@+id/proxy_settings"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content"
android:prompt="@string/proxy_settings_title" android:prompt="@string/proxy_settings_title"
android:entries="@array/wifi_proxy_settings" /> android:entries="@array/wifi_proxy_settings" />
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/proxy_fields" <LinearLayout android:id="@+id/proxy_fields"
android:layout_width="match_parent" style="@style/wifi_section"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <LinearLayout style="@style/wifi_item">
style="?android:attr/textAppearanceSmall" <TextView
android:layout_width="match_parent" style="@style/wifi_item_label"
android:layout_height="wrap_content" android:text="@string/proxy_hostname_label" />
android:layout_marginTop="8dip"
android:text="@string/proxy_hostname_label" />
<EditText android:id="@+id/proxy_hostname" <EditText android:id="@+id/proxy_hostname"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:singleLine="true"
android:singleLine="true" android:inputType="textNoSuggestions" />
android:inputType="textNoSuggestions" /> </LinearLayout>
<TextView <LinearLayout style="@style/wifi_item">
style="?android:attr/textAppearanceSmall" <TextView
android:layout_width="match_parent" style="@style/wifi_item_label"
android:layout_height="wrap_content" android:text="@string/proxy_port_label" />
android:layout_marginTop="8dip"
android:text="@string/proxy_port_label" />
<EditText android:id="@+id/proxy_port" <EditText android:id="@+id/proxy_port"
android:layout_width="match_parent" style="@style/wifi_item_content"
android:layout_height="wrap_content" android:singleLine="true"
android:singleLine="true" android:inputType="textNoSuggestions" />
android:inputType="textNoSuggestions" /> </LinearLayout>
<TextView <LinearLayout style="@style/wifi_item">
style="?android:attr/textAppearanceSmall" <TextView
android:layout_width="match_parent" style="@style/wifi_item_label"
android:layout_height="wrap_content" android:text="@string/proxy_exclusionlist_label" />
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" />
<EditText android:id="@+id/proxy_exclusionlist"
style="@style/wifi_item_content"
android:singleLine="true"
android:inputType="textNoSuggestions" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

15
res/layout/wifi_dialog_row.xml
View File

@@ -15,18 +15,13 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" style="@style/wifi_item" >
android:layout_height="wrap_content">
<TextView <TextView
android:id="@+id/name" style="@style/wifi_item_label"
android:layout_width="wrap_content" android:id="@+id/name" />
android:layout_height="wrap_content"
android:layout_marginRight="8dip"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView <TextView
android:id="@+id/value" android:id="@+id/value"
android:layout_width="wrap_content" style="@style/wifi_item_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>

30
res/values-xlarge/styles.xml
View File

@@ -20,4 +20,34 @@
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
</style> </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> </resources>

27
res/values/styles.xml
View File

@@ -82,4 +82,31 @@
<style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge"> <style name="Theme.CreateShortCut" parent="android:Theme.Holo.DialogWhenLarge">
</style> </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> </resources>