diff options
author | Alan Viverette <alanv@google.com> | 2014-06-06 13:25:19 -0700 |
---|---|---|
committer | Alan Viverette <alanv@google.com> | 2014-06-06 21:48:57 +0000 |
commit | 77762c586d861bcc90ec9ac0211dddc886df4db0 (patch) | |
tree | a60a68aeed1f366ce36e74bc6bb393b0d7051533 | |
parent | 97c57ccec07ac91bacb71699b10dcdd24b750c3c (diff) |
DO NOT MERGE Material theme
BUG: 15467097
Change-Id: Ic49f6c1002265d10fcd17f34e2bba1fc7f97d822
-rw-r--r-- | res/values/styles.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 96ebe903e..a9a48432f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -16,7 +16,7 @@ --> <resources> <style name="DialtactsTheme" - parent="android:Theme.Quantum.Light"> + parent="android:Theme.Material.Light"> <item name="android:textColorPrimary">@color/dialtacts_primary_text_color</item> <item name="android:textColorSecondary">@color/dialtacts_secondary_text_color</item> <item name="android:windowActionBarOverlay">true</item> @@ -77,13 +77,13 @@ <!-- Action bar overflow menu icon. --> <style name="DialtactsActionBarOverflow" - parent="@android:style/Widget.Quantum.Light.ActionButton.Overflow"> + parent="@android:style/Widget.Material.Light.ActionButton.Overflow"> <item name="android:src">@drawable/ic_menu_overflow_lt</item> </style> <!-- Action bar overflow menu icon. White with no shadow. --> <style name="DialtactsActionBarOverflowWhite" - parent="@android:style/Widget.Quantum.Light.ActionButton.Overflow"> + parent="@android:style/Widget.Material.Light.ActionButton.Overflow"> <item name="android:src">@drawable/overflow_menu</item> </style> @@ -117,7 +117,7 @@ <item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflowWhite</item> </style> - <style name="DialtactsActionBarStyle" parent="android:Widget.Quantum.ActionBar"> + <style name="DialtactsActionBarStyle" parent="android:Widget.Material.ActionBar"> <item name="android:background">@color/actionbar_background_color</item> <item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item> <item name="android:height">@dimen/action_bar_height</item> @@ -132,20 +132,20 @@ <!-- Text in the action bar at the top of the screen --> <style name="DialtactsActionBarTitleText" - parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Title"> + parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title"> <item name="android:textColor">@color/actionbar_text_color</item> </style> <!-- Text style for tabs. --> <style name="DialtactsActionBarTabTextStyle" - parent="android:style/Widget.Quantum.Light.ActionBar.TabText"> + parent="android:style/Widget.Material.Light.ActionBar.TabText"> <item name="android:textColor">@color/tab_text_color</item> <item name="android:textSize">@dimen/tab_text_size</item> <item name="android:fontFamily">@string/tab_font_family</item> <item name="android:textStyle">bold</item> </style> - <style name="ListViewStyle" parent="@android:style/Widget.Quantum.Light.ListView"> + <style name="ListViewStyle" parent="@android:style/Widget.Material.Light.ListView"> <item name="android:overScrollMode">always</item> </style> |