-->
<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" />
<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>