summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-04-14 23:15:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-14 23:15:35 +0000
commitfb8080e7627b91f25e4c13a270d2a7de8e5c609b (patch)
tree75eda136d822d378c94955fd4cf103ba59319f8f
parent09a727e47df21d00a2e6cd814f4a4bc895155047 (diff)
parent57a018702228d930529eb4f7c269c05243bc15e7 (diff)
Merge "Switch Dialer to Quantum.Light theme"
-rw-r--r--res/drawable-hdpi/ic_menu_overflow_lt.pngbin643 -> 947 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_overflow_lt.pngbin615 -> 692 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_overflow_lt.pngbin797 -> 1388 bytes
-rw-r--r--res/drawable-xxhdpi/ic_menu_overflow_lt.pngbin1179 -> 4576 bytes
-rw-r--r--res/values/styles.xml16
5 files changed, 8 insertions, 8 deletions
diff --git a/res/drawable-hdpi/ic_menu_overflow_lt.png b/res/drawable-hdpi/ic_menu_overflow_lt.png
index 2561b8c22..57db353f7 100644
--- a/res/drawable-hdpi/ic_menu_overflow_lt.png
+++ b/res/drawable-hdpi/ic_menu_overflow_lt.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_overflow_lt.png b/res/drawable-mdpi/ic_menu_overflow_lt.png
index 7dc68c91e..c69937428 100644
--- a/res/drawable-mdpi/ic_menu_overflow_lt.png
+++ b/res/drawable-mdpi/ic_menu_overflow_lt.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_overflow_lt.png b/res/drawable-xhdpi/ic_menu_overflow_lt.png
index 95e436c4b..e538b9894 100644
--- a/res/drawable-xhdpi/ic_menu_overflow_lt.png
+++ b/res/drawable-xhdpi/ic_menu_overflow_lt.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_menu_overflow_lt.png b/res/drawable-xxhdpi/ic_menu_overflow_lt.png
index b9f0c3def..7f3f73386 100644
--- a/res/drawable-xxhdpi/ic_menu_overflow_lt.png
+++ b/res/drawable-xxhdpi/ic_menu_overflow_lt.png
Binary files differ
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 87e08e3fd..78c1cc7a8 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -16,7 +16,7 @@
-->
<resources>
<style name="DialtactsTheme"
- parent="android:Theme.Holo.Light">
+ parent="android:Theme.Quantum.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">false</item>
@@ -96,7 +96,7 @@
<!-- Action bar overflow menu icon. -->
<style name="DialtactsActionBarOverflow"
- parent="@android:style/Widget.Holo.ActionButton.Overflow">
+ parent="@android:style/Widget.Quantum.Light.ActionButton.Overflow">
<item name="android:src">@drawable/ic_menu_overflow_lt</item>
</style>
@@ -108,7 +108,7 @@
<item name="android:windowActionBarOverlay">true</item>
</style>
- <style name="CallDetailActivityTheme" parent="android:Theme.Holo.Light">
+ <style name="CallDetailActivityTheme" parent="android:Theme.Quantum.Light">
<item name="android:windowBackground">@color/background_dialer_light</item>
<item name="android:gravity">top</item>
<item name="android:listViewStyle">@style/ListViewStyle</item>
@@ -170,7 +170,7 @@
<item name="android:layout_gravity">center</item>
</style>
- <style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">
+ <style name="DialtactsActionBarStyle" parent="android:Widget.Quantum.ActionBar">
<item name="android:background">@drawable/call_history_actionbar_background</item>
<item name="android:backgroundStacked">#ffffff</item>
<item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
@@ -180,13 +180,13 @@
<!-- Text in the action bar at the top of the screen -->
<style name="DialtactsActionBarTitleText"
- parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
+ parent="@android:style/TextAppearance.Quantum.Widget.ActionBar.Title">
<item name="android:textColor">@color/actionbar_text_color</item>
</style>
<!-- Styling for the tab bar; handles styling of the divider line. -->
<style name="DialtactsActionBarTabBarStyle"
- parent="@android:style/Widget.Holo.ActionBar.TabBar">
+ parent="@android:style/Widget.Quantum.ActionBar.TabBar">
<item name="android:divider">@drawable/divider</item>
<item name="android:showDividers">middle</item>
<item name="android:dividerPadding">@dimen/tab_divider_padding</item>
@@ -201,14 +201,14 @@
<!-- Text style for tabs. -->
<style name="DialtactsActionBarTabTextStyle"
- parent="android:style/Widget.Holo.Light.ActionBar.TabText">
+ parent="android:style/Widget.Quantum.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.Holo.Light.ListView">
+ <style name="ListViewStyle" parent="@android:style/Widget.Quantum.Light.ListView">
<item name="android:overScrollMode">always</item>
</style>