summaryrefslogtreecommitdiff
path: root/res/values/styles.xml
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-05-31 00:00:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-31 00:00:07 +0000
commit71f21658d950a34330a92a2437c4e02415452de9 (patch)
tree44233dc3e9f101097c528d9c04be17c9d221ac62 /res/values/styles.xml
parent982342df9ac866f298026a2baaa9d5956aada869 (diff)
parentfa3b108973f3cd47dba32b87d66372b23b27243a (diff)
am fa3b1089: Merge "Update activity styles" into lmp-preview-dev
* commit 'fa3b108973f3cd47dba32b87d66372b23b27243a': Update activity styles
Diffstat (limited to 'res/values/styles.xml')
-rw-r--r--res/values/styles.xml19
1 files changed, 1 insertions, 18 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 1044a1eba..d41524f2b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -94,12 +94,8 @@
<item name="android:actionBarStyle">@style/DialtactsActionBarWithoutTitleStyle</item>
</style>
- <style name="CallDetailActivityTheme" parent="android:Theme.Quantum.Light">
+ <style name="CallDetailActivityTheme" parent="DialtactsThemeWithoutActionBarOverlay">
<item name="android:windowBackground">@color/background_dialer_light</item>
- <item name="android:gravity">top</item>
- <item name="android:listViewStyle">@style/ListViewStyle</item>
- <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item>
- <item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflow</item>
<!-- CallLog -->
<item name="call_log_primary_text_color">#404040</item>
<item name="call_log_primary_background_color">#FFFFFF</item>
@@ -115,7 +111,6 @@
<style name="DialtactsActionBarStyle" parent="android:Widget.Quantum.ActionBar">
<item name="android:background">@color/actionbar_background_color</item>
- <item name="android:backgroundStacked">#ffffff</item>
<item name="android:titleTextStyle">@style/DialtactsActionBarTitleText</item>
<item name="android:height">@dimen/action_bar_height</item>
<!-- Empty icon -->
@@ -132,18 +127,6 @@
<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.Quantum.ActionBar.TabBar">
- <item name="android:showDividers">none</item>
- </style>
-
- <!-- Styling for tabs. -->
- <style name="DialtactsActionBarTabStyle" parent="@android:style/Widget.Quantum.ActionBar.TabView">
- <item name="android:background">@drawable/action_bar_tab</item>
- <item name="android:showDividers">none</item>
- </style>
-
<!-- Text style for tabs. -->
<style name="DialtactsActionBarTabTextStyle"
parent="android:style/Widget.Quantum.Light.ActionBar.TabText">