summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-09-10 02:29:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-10 02:29:53 +0000
commitd3c6acd57cb92fbe7207749c4ad7e6e3deb81c9c (patch)
tree33b4461252cc3d612f9512dda3d0be4f8053be73
parent22ca2fee71881e7935997e61fee05c40d2f47436 (diff)
parentfb64bfad3987bb3d27fd7ae77fcdc4df2d7b58ec (diff)
Merge "Remove duplicate style" into klp-dev
-rw-r--r--res/values/styles.xml10
1 files changed, 2 insertions, 8 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index aab1c538f..8df2e6b53 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,7 +20,7 @@
<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>
- <item name="android:actionBarStyle">@style/DialtactsActionBarStyleNew</item>
+ <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
<item name="android:actionBarTabStyle">@style/DialtactsActionBarTabStyle</item>
<item name="android:windowContentOverlay">@null</item>
<!-- Searchbox Style -->
@@ -117,7 +117,7 @@
<item name="android:background">#66000000</item>
</style>
- <style name="DialtactsActionBarStyleNew" parent="android:Widget.Holo.ActionBar">
+ <style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">
<item name="android:background">@drawable/call_history_actionbar_background</item>
<item name="android:backgroundStacked">@color/actionbar_background_color</item>
<!-- Empty icon -->
@@ -125,12 +125,6 @@
<item name="android:displayOptions"></item>
</style>
- <style name="DialtactsActionBarStyle" parent="android:Widget.Holo.ActionBar">
- <item name="android:backgroundSplit">@null</item>
- <item name="android:backgroundStacked">@drawable/ab_stacked_opaque_dark_holo</item>
- <item name="android:displayOptions"></item>
- </style>
-
<style name="DialtactsActionBarTabStyle" parent="@android:style/Widget.Holo.ActionBar.TabView">
<item name="android:background">@drawable/action_bar_tab</item>
</style>