Merge "Fix style for text colour settings"
diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index 6d9691b..977a387 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -36,7 +36,7 @@
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -49,7 +49,7 @@
android:inputType="textNoSuggestions" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -69,7 +69,7 @@
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
@@ -89,7 +89,7 @@
android:layout_marginBottom="10sp"/>
<CheckBox android:id="@+id/show_password"
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/wifi_show_password" />
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index dea5da6..a897406 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -36,7 +36,7 @@
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -57,7 +57,7 @@
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -79,7 +79,7 @@
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -92,7 +92,7 @@
android:inputType="textNoSuggestions" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -118,7 +118,7 @@
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
@@ -131,7 +131,7 @@
android:entries="@array/wifi_eap_method" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -144,7 +144,7 @@
android:entries="@array/wifi_phase2_entries" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
@@ -156,7 +156,7 @@
android:prompt="@string/wifi_eap_ca_cert" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
@@ -168,7 +168,7 @@
android:prompt="@string/wifi_eap_user_cert" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
@@ -181,7 +181,7 @@
android:inputType="textNoSuggestions" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
@@ -195,7 +195,7 @@
</LinearLayout>
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
@@ -208,7 +208,7 @@
android:password="true" />
<CheckBox android:id="@+id/show_password"
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/wifi_show_password" />
@@ -221,7 +221,7 @@
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -241,7 +241,7 @@
android:orientation="vertical"
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -254,7 +254,7 @@
android:inputType="textNoSuggestions" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -267,7 +267,7 @@
android:inputType="textNoSuggestions" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -280,7 +280,7 @@
android:inputType="textNoSuggestions" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -293,7 +293,7 @@
android:inputType="textNoSuggestions" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -313,7 +313,7 @@
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -332,7 +332,7 @@
android:orientation="vertical"
android:visibility="gone">
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -344,7 +344,7 @@
android:singleLine="true"
android:inputType="textNoSuggestions" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
@@ -356,7 +356,7 @@
android:singleLine="true"
android:inputType="textNoSuggestions" />
<TextView
- style="?android:attr/textAppearanceSmallInverse"
+ style="?android:attr/textAppearanceSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
diff --git a/res/layout/wifi_dialog_row.xml b/res/layout/wifi_dialog_row.xml
index 52819d4..757d975 100644
--- a/res/layout/wifi_dialog_row.xml
+++ b/res/layout/wifi_dialog_row.xml
@@ -22,11 +22,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="8dip"
- android:textAppearance="?android:attr/textAppearanceSmallInverse" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceSmallInverse"
+ android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
</LinearLayout>