diff options
| author | Yorke Lee <yorkelee@google.com> | 2013-09-09 19:35:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-09 19:35:52 -0700 |
| commit | e61d60618d09649926b86141b7c7114a01285ec3 (patch) | |
| tree | 33b4461252cc3d612f9512dda3d0be4f8053be73 /res | |
| parent | 5fd7d803f969e573e8188b478fc538e7f50f25c6 (diff) | |
| parent | 7373ee448e6185dcbdafaadfafae31d44087ae4a (diff) | |
am 7373ee44: am d3c6acd5: Merge "Remove duplicate style" into klp-dev
* commit '7373ee448e6185dcbdafaadfafae31d44087ae4a':
Remove duplicate style
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/styles.xml | 10 |
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> |