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

Updated Wi-Fi hotspot dialog to the Material Spec.

Browse Source 
+ If there is scrolling then force the scrollbars to always appear.
+ Align contents of the dialog with the title.
+ Change "Network SSID" to "Network name".
+ Added wifi_* styles to other style xml files so that Wi-Fi hotspot dialogs are visible on tablets.
+ Move layout_width/height from res/layout/{wifi_dialog.xml, wifi_dialog_row.xml} from style into the xml file.

Bug: 17684359
Change-Id: I42fb69132d6ba0fb8d9853de6f5524f29e6b70b6
This commit is contained in:
PauloftheWest
2014-10-02 06:22:47 -07:00
parent 59d33dbd25
commit 6e26427e52
8 changed files with 308 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
res/layout/wifi_ap_dialog.xml
View File

@@ -16,50 +16,54 @@
<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="300sp"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:fadeScrollbars="false">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
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" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item"
android:orientation="vertical" /> android:orientation="vertical" />
<LinearLayout android:id="@+id/type" <LinearLayout android:id="@+id/type"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:layout_marginTop="8dip" 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" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:hint="@string/wifi_ssid_hint" android:hint="@string/wifi_ssid_hint"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:maxLength="32" /> android:maxLength="32" />
<TextView <TextView
style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:layout_marginTop="8dip" 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" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_content"
android:prompt="@string/wifi_security" android:prompt="@string/wifi_security"
android:entries="@array/wifi_ap_security" /> android:entries="@array/wifi_ap_security" />
</LinearLayout> </LinearLayout>
@@ -67,36 +71,38 @@
<LinearLayout android:id="@+id/fields" <LinearLayout android:id="@+id/fields"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="4dip" style="@style/wifi_item_label"
android:layout_marginTop="8dip"
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" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:password="true" android:password="true"
android:maxLength="63" android:maxLength="63"
android:imeOptions="flagForceAscii" /> android:imeOptions="flagForceAscii" />
<TextView android:id="@+id/hint" <TextView android:id="@+id/hint"
style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="12sp" style="@style/wifi_item_label"
android:text="@string/credentials_password_too_short" android:text="@string/credentials_password_too_short"
android:layout_marginTop="8dip"
android:layout_marginBottom="10sp"/> android:layout_marginBottom="10sp"/>
<CheckBox android:id="@+id/show_password" <CheckBox android:id="@+id/show_password"
style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_content"
android:text="@string/wifi_show_password" /> android:text="@string/wifi_show_password" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

208
res/layout/wifi_dialog.xml
View File

@@ -26,20 +26,30 @@
android:paddingBottom="8dip"> android:paddingBottom="8dip">
<LinearLayout android:id="@+id/info" <LinearLayout android:id="@+id/info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_section" /> style="@style/wifi_section" />
<LinearLayout android:id="@+id/type" <LinearLayout android:id="@+id/type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_section" style="@style/wifi_section"
android:visibility="gone"> android:visibility="gone">
<LinearLayout <LinearLayout
style="@style/wifi_item" > android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
android:text="@string/wifi_ssid" android:text="@string/wifi_ssid"
android:textDirection="locale" /> android:textDirection="locale" />
<EditText android:id="@+id/ssid" <EditText android:id="@+id/ssid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:hint="@string/wifi_ssid_hint" android:hint="@string/wifi_ssid_hint"
android:maxLength="32" android:maxLength="32"
@@ -47,98 +57,144 @@
android:inputType="textNoSuggestions" /> android:inputType="textNoSuggestions" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
style="@style/wifi_item" > android:layout_width="match_parent"
<TextView android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item" >
android:text="@string/wifi_security" /> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:text="@string/wifi_security" />
<Spinner android:id="@+id/security" <Spinner android:id="@+id/security"
style="@style/wifi_item_content" android:layout_width="match_parent"
android:prompt="@string/wifi_security" android:layout_height="wrap_content"
android:entries="@array/wifi_security" /> style="@style/wifi_item_content"
</LinearLayout> android:prompt="@string/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"
android:layout_height="wrap_content"
style="@style/wifi_section" style="@style/wifi_section"
android:visibility="gone"> android:visibility="gone">
<LinearLayout android:id="@+id/eap" <LinearLayout android:id="@+id/eap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_section" style="@style/wifi_section"
android:visibility="gone"> android:visibility="gone">
<LinearLayout android:id="@+id/l_method" <LinearLayout android:id="@+id/l_method"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_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> </LinearLayout>
<LinearLayout android:id="@+id/l_phase2" <LinearLayout android:id="@+id/l_phase2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_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> </LinearLayout>
<LinearLayout android:id="@+id/l_ca_cert" <LinearLayout android:id="@+id/l_ca_cert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_content"
android:prompt="@string/wifi_eap_ca_cert" /> android:prompt="@string/wifi_eap_ca_cert" />
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/l_user_cert" <LinearLayout android:id="@+id/l_user_cert"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_content"
android:prompt="@string/wifi_eap_user_cert" /> android:prompt="@string/wifi_eap_user_cert" />
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/l_identity" <LinearLayout android:id="@+id/l_identity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:inputType="textNoSuggestions" /> android:inputType="textNoSuggestions" />
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/l_anonymous" <LinearLayout android:id="@+id/l_anonymous"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:inputType="textNoSuggestions" /> android:inputType="textNoSuggestions" />
@@ -146,34 +202,50 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/password_layout" <LinearLayout android:id="@+id/password_layout"
style="@style/wifi_item" > android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:password="true" /> android:password="true" />
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/show_password_layout" <LinearLayout android:id="@+id/show_password_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" > style="@style/wifi_item" >
<!-- Dummy to enable right-justification of checkbox --> <!-- Dummy to enable right-justification of checkbox -->
<TextView <TextView
style="@style/wifi_item_label" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" />
<CheckBox android:id="@+id/show_password" <CheckBox android:id="@+id/show_password"
style="@style/wifi_item_content" android:layout_width="match_parent"
android:textSize="14sp" android:layout_height="wrap_content"
android:text="@string/wifi_show_password" /> style="@style/wifi_item_content"
android:textSize="14sp"
android:text="@string/wifi_show_password" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/wifi_advanced_toggle" <LinearLayout android:id="@+id/wifi_advanced_toggle"
style="@style/wifi_item" android:layout_width="match_parent"
android:visibility="gone"> android:layout_height="wrap_content"
style="@style/wifi_item"
android:visibility="gone">
<CheckBox android:id="@+id/wifi_advanced_togglebox" <CheckBox android:id="@+id/wifi_advanced_togglebox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_content"
android:textSize="14sp" android:textSize="14sp"
android:text="@string/wifi_show_advanced" /> android:text="@string/wifi_show_advanced" />
@@ -186,14 +258,20 @@
android:visibility="gone"> android:visibility="gone">
<LinearLayout android:id="@+id/proxy_settings_fields" <LinearLayout android:id="@+id/proxy_settings_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" style="@style/wifi_item"
android:visibility="gone"> android:visibility="gone">
<TextView android:id="@+id/proxy_settings_title" <TextView android:id="@+id/proxy_settings_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_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" />
@@ -201,26 +279,41 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/proxy_warning_limited_support" <LinearLayout android:id="@+id/proxy_warning_limited_support"
style="@style/wifi_item" android:layout_width="match_parent"
android:visibility="gone"> android:layout_height="wrap_content"
<!-- Dummy to enable right-justification of warning --> style="@style/wifi_item"
<TextView android:visibility="gone">
<!-- Dummy to enable right-justification of warning -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" /> style="@style/wifi_item_label" />
<TextView <TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_content"
android:text="@string/proxy_warning_limited_support" /> android:text="@string/proxy_warning_limited_support" />
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/proxy_pac_field" <LinearLayout android:id="@+id/proxy_pac_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_section" style="@style/wifi_section"
android:visibility="gone"> android:visibility="gone">
<LinearLayout style="@style/wifi_item"> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item">
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
android:text="@string/proxy_url_title" /> android:text="@string/proxy_url_title" />
<EditText android:id="@+id/proxy_pac" <EditText android:id="@+id/proxy_pac"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_content"
android:hint="@string/proxy_url_hint" android:hint="@string/proxy_url_hint"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
@@ -228,37 +321,60 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/proxy_fields" <LinearLayout android:id="@+id/proxy_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_section" style="@style/wifi_section"
android:visibility="gone"> android:visibility="gone">
<LinearLayout style="@style/wifi_item"> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item">
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
android:text="@string/proxy_hostname_label" /> android:text="@string/proxy_hostname_label" />
<EditText android:id="@+id/proxy_hostname" <EditText android:id="@+id/proxy_hostname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:hint="@string/proxy_hostname_hint" android:hint="@string/proxy_hostname_hint"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:singleLine="true" /> android:singleLine="true" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/wifi_item"> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item">
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
android:text="@string/proxy_port_label" /> android:text="@string/proxy_port_label" />
<EditText android:id="@+id/proxy_port" <EditText android:id="@+id/proxy_port"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:hint="@string/proxy_port_hint" android:hint="@string/proxy_port_hint"
android:inputType="number" android:inputType="number"
android:singleLine="true" /> android:singleLine="true" />
</LinearLayout> </LinearLayout>
<LinearLayout style="@style/wifi_item"> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item">
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
android:text="@string/proxy_exclusionlist_label" /> android:text="@string/proxy_exclusionlist_label" />
<EditText android:id="@+id/proxy_exclusionlist" <EditText android:id="@+id/proxy_exclusionlist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:hint="@string/proxy_exclusionlist_hint" android:hint="@string/proxy_exclusionlist_hint"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
@@ -267,14 +383,20 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/ip_fields" <LinearLayout android:id="@+id/ip_fields"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" style="@style/wifi_item"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_content" style="@style/wifi_item_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" />
@@ -282,15 +404,23 @@
</LinearLayout> </LinearLayout>
<LinearLayout android:id="@+id/staticip" <LinearLayout android:id="@+id/staticip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_section" style="@style/wifi_section"
android:visibility="gone"> android:visibility="gone">
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:hint="@string/wifi_ip_address_hint" android:hint="@string/wifi_ip_address_hint"
@@ -298,12 +428,18 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:hint="@string/wifi_gateway_hint" android:hint="@string/wifi_gateway_hint"
@@ -311,24 +447,36 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
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"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:hint="@string/wifi_network_prefix_length_hint" android:hint="@string/wifi_network_prefix_length_hint"
android:inputType="number" /> android:inputType="number" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
android:text="@string/wifi_dns1" /> android:text="@string/wifi_dns1" />
<EditText android:id="@+id/dns1" <EditText android:id="@+id/dns1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:hint="@string/wifi_dns1_hint" android:hint="@string/wifi_dns1_hint"
@@ -336,12 +484,18 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
android:text="@string/wifi_dns2" /> android:text="@string/wifi_dns2" />
<EditText android:id="@+id/dns2" <EditText android:id="@+id/dns2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_edit_content"
android:singleLine="true" android:singleLine="true"
android:hint="@string/wifi_dns2_hint" android:hint="@string/wifi_dns2_hint"

14
res/layout/wifi_dialog_row.xml
View File

@@ -15,15 +15,19 @@
--> -->
<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"
android:layout_height="wrap_content"
style="@style/wifi_item" > style="@style/wifi_item" >
<TextView <TextView android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/wifi_item_label" style="@style/wifi_item_label"
android:id="@+id/name"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
<TextView <TextView android:id="@+id/value"
android:id="@+id/value" android:layout_width="match_parent"
style="@style/wifi_item_content" android:layout_height="wrap_content"
style="@style/wifi_item_label"
android:textStyle="bold" android:textStyle="bold"
android:textAlignment="viewStart" /> android:textAlignment="viewStart" />
</LinearLayout> </LinearLayout>

34
res/values-land/styles.xml
View File

@@ -18,4 +18,38 @@
<style name="KeyguardAppWidgetItem"> <style name="KeyguardAppWidgetItem">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="wifi_item">
<item name="android:layout_marginTop">8dip</item>
<item name="android:layout_marginStart">8dip</item>
<item name="android:layout_marginEnd">8dip</item>
<item name="android:paddingStart">8dip</item>
<item name="android:paddingEnd">8dip</item>
<item name="android:orientation">vertical</item>
<item name="android:gravity">start</item>
</style>
<style name="wifi_item_label">
<item name="android:paddingStart">8dip</item>
<item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
<item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
</style>
<style name="wifi_item_content">
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
<item name="android:textColor">@*android:color/primary_text_default_material_light</item>
</style>
<style name="wifi_item_edit_content">
<item name="android:paddingStart">4dip</item>
<item name="android:layout_marginStart">4dip</item>
<item name="android:textSize">18sp</item>
</style>
<style name="wifi_section">
<item name="android:orientation">vertical</item>
</style>
</resources> </resources>

34
res/values-sw600dp-land/styles.xml
View File

@@ -18,4 +18,38 @@
<style name="KeyguardAppWidgetItem"> <style name="KeyguardAppWidgetItem">
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>
</style> </style>
<style name="wifi_item">
<item name="android:layout_marginTop">8dip</item>
<item name="android:layout_marginStart">8dip</item>
<item name="android:layout_marginEnd">8dip</item>
<item name="android:paddingStart">8dip</item>
<item name="android:paddingEnd">8dip</item>
<item name="android:orientation">vertical</item>
<item name="android:gravity">start</item>
</style>
<style name="wifi_item_label">
<item name="android:paddingStart">8dip</item>
<item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
<item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
</style>
<style name="wifi_item_content">
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
<item name="android:textColor">@*android:color/primary_text_default_material_light</item>
</style>
<style name="wifi_item_edit_content">
<item name="android:paddingStart">4dip</item>
<item name="android:layout_marginStart">4dip</item>
<item name="android:textSize">18sp</item>
</style>
<style name="wifi_section">
<item name="android:orientation">vertical</item>
</style>
</resources> </resources>

34
res/values-sw720dp/styles.xml
View File

@@ -18,4 +18,38 @@
<style name="KeyguardAppWidgetItem"> <style name="KeyguardAppWidgetItem">
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>
</style> </style>
<style name="wifi_item">
<item name="android:layout_marginTop">8dip</item>
<item name="android:layout_marginStart">8dip</item>
<item name="android:layout_marginEnd">8dip</item>
<item name="android:paddingStart">8dip</item>
<item name="android:paddingEnd">8dip</item>
<item name="android:orientation">vertical</item>
<item name="android:gravity">start</item>
</style>
<style name="wifi_item_label">
<item name="android:paddingStart">8dip</item>
<item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Body1</item>
<item name="android:textColor">@*android:color/secondary_text_default_material_light</item>
</style>
<style name="wifi_item_content">
<item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
<item name="android:textColor">@*android:color/primary_text_default_material_light</item>
</style>
<style name="wifi_item_edit_content">
<item name="android:paddingStart">4dip</item>
<item name="android:layout_marginStart">4dip</item>
<item name="android:textSize">18sp</item>
</style>
<style name="wifi_section">
<item name="android:orientation">vertical</item>
</style>
</resources> </resources>

2
res/values/strings.xml
View File

@@ -1554,7 +1554,7 @@
<!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] --> <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
<string name="wifi_wps_failed_overlap">Another WPS session was detected. Please try again in a few minutes.</string> <string name="wifi_wps_failed_overlap">Another WPS session was detected. Please try again in a few minutes.</string>
<!-- Label for the SSID of the network --> <!-- Label for the SSID of the network -->
<string name="wifi_ssid">Network SSID</string> <string name="wifi_ssid">Network name</string>
<!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] --> <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
<string name="wifi_ssid_hint">Enter the SSID</string> <string name="wifi_ssid_hint">Enter the SSID</string>
<!-- Label for the security of the connection --> <!-- Label for the security of the connection -->

10
res/values/styles.xml
View File

@@ -220,8 +220,6 @@
</style> </style>
<style name="wifi_item"> <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_marginTop">8dip</item>
<item name="android:layout_marginStart">8dip</item> <item name="android:layout_marginStart">8dip</item>
<item name="android:layout_marginEnd">8dip</item> <item name="android:layout_marginEnd">8dip</item>
@@ -232,8 +230,6 @@
</style> </style>
<style name="wifi_item_label"> <style name="wifi_item_label">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingStart">8dip</item> <item name="android:paddingStart">8dip</item>
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
@@ -242,24 +238,18 @@
</style> </style>
<style name="wifi_item_content"> <style name="wifi_item_content">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textAlignment">viewStart</item> <item name="android:textAlignment">viewStart</item>
<item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item> <item name="android:textAppearance">@android:style/TextAppearance.Material.Subhead</item>
<item name="android:textColor">@*android:color/primary_text_default_material_light</item> <item name="android:textColor">@*android:color/primary_text_default_material_light</item>
</style> </style>
<style name="wifi_item_edit_content"> <style name="wifi_item_edit_content">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingStart">4dip</item> <item name="android:paddingStart">4dip</item>
<item name="android:layout_marginStart">4dip</item> <item name="android:layout_marginStart">4dip</item>
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>
</style> </style>
<style name="wifi_section"> <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> <item name="android:orientation">vertical</item>
</style> </style>