Merge "Material theme updates for Wifi Dialog." into lmp-dev

This commit is contained in:
PauloftheWest
2014-09-08 22:01:06 +00:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 3 deletions

View File

@@ -49,7 +49,7 @@
<LinearLayout
style="@style/wifi_item" >
<TextView
style="@style/wifi_item_content"
style="@style/wifi_item_label"
android:text="@string/wifi_security" />
<Spinner android:id="@+id/security"
@@ -148,8 +148,6 @@
style="@style/wifi_item" >
<TextView
style="@style/wifi_item_label"
android:textAppearance="@android:style/TextAppearance.Material.Body2"
android:textColor="?android:attr/colorAccent"
android:text="@string/wifi_password" />
<EditText android:id="@+id/password"

View File

@@ -234,6 +234,8 @@
<item name="android:layout_height">wrap_content</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">
@@ -241,6 +243,8 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">18sp</item>
<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">