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

Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am: aead073d44

Browse Source 
am: 3fdb526bbd

* commit '3fdb526bbd7959ea5959922d86387232063b91a9':
  Set Wi-Fi dialog spinners to 48dps tall

Change-Id: Ib86a8883fd042f796fa83e9a9b341c94efea89a6
This commit is contained in:
Maurice Lam
2016-05-12 17:50:44 +00:00
committed by android-build-merger
parent c602a41e8b 3fdb526bbd
commit 6de1c7e4f0
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/layout/wifi_dialog.xml
View File

@@ -15,9 +15,10 @@
--> -->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fadeScrollbars="false"> android:fadeScrollbars="false"
android:scrollIndicators="top|bottom">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -71,7 +72,7 @@
<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" style="@style/wifi_item_spinner"
android:prompt="@string/wifi_security" android:prompt="@string/wifi_security"
android:entries="@array/wifi_security" /> android:entries="@array/wifi_security" />
</LinearLayout> </LinearLayout>
@@ -103,7 +104,7 @@
<Spinner android:id="@+id/method" <Spinner android:id="@+id/method"
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" style="@style/wifi_item_spinner"
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>
@@ -122,7 +123,7 @@
<Spinner android:id="@+id/phase2" <Spinner android:id="@+id/phase2"
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" style="@style/wifi_item_spinner"
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>
@@ -141,7 +142,7 @@
<Spinner android:id="@+id/ca_cert" <Spinner android:id="@+id/ca_cert"
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" style="@style/wifi_item_spinner"
android:prompt="@string/wifi_eap_ca_cert" /> android:prompt="@string/wifi_eap_ca_cert" />
</LinearLayout> </LinearLayout>
@@ -201,7 +202,7 @@
<Spinner android:id="@+id/user_cert" <Spinner android:id="@+id/user_cert"
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" style="@style/wifi_item_spinner"
android:prompt="@string/wifi_eap_user_cert" /> android:prompt="@string/wifi_eap_user_cert" />
</LinearLayout> </LinearLayout>
@@ -285,6 +286,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item" style="@style/wifi_item"
android:paddingBottom="4dp"
android:visibility="gone"> android:visibility="gone">
<CheckBox android:id="@+id/wifi_advanced_togglebox" <CheckBox android:id="@+id/wifi_advanced_togglebox"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -314,7 +316,7 @@
<Spinner android:id="@+id/proxy_settings" <Spinner android:id="@+id/proxy_settings"
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" style="@style/wifi_item_spinner"
android:prompt="@string/proxy_settings_title" android:prompt="@string/proxy_settings_title"
android:entries="@array/wifi_proxy_settings" /> android:entries="@array/wifi_proxy_settings" />
@@ -439,7 +441,7 @@
<Spinner android:id="@+id/ip_settings" <Spinner android:id="@+id/ip_settings"
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" style="@style/wifi_item_spinner"
android:prompt="@string/wifi_ip_settings" android:prompt="@string/wifi_ip_settings"
android:entries="@array/wifi_ip_settings" /> android:entries="@array/wifi_ip_settings" />

4
res/values/styles.xml
View File

@@ -228,6 +228,10 @@
<item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textColor">?android:attr/textColorPrimary</item>
</style> </style>
<style name="wifi_item_spinner" parent="wifi_item_content">
<item name="android:minHeight">48dp</item>
</style>
<style name="wifi_advanced_toggle" parent="wifi_item_content"> <style name="wifi_advanced_toggle" parent="wifi_item_content">
<item name="android:background">@null</item> <item name="android:background">@null</item>
<item name="android:button">@null</item> <item name="android:button">@null</item>