Merge "Use "blessed" theme setup. b/17210109" into ub-gmail-ur14-dev
diff --git a/res/layout/toolbar_with_search.xml b/res/layout/toolbar_with_search.xml
index d7000a8..c702475 100644
--- a/res/layout/toolbar_with_search.xml
+++ b/res/layout/toolbar_with_search.xml
@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/colorPrimary"
- app:theme="?attr/actionBarTheme">
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<!-- Custom view for search icon -->
<LinearLayout
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 7fd779e..56aaaab 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -18,9 +18,14 @@
<item name="homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item>
</style>
- <style name="UnifiedEmailTheme.Appcompat.Toolbar" parent="@style/UnifiedEmailTheme.Appcompat">
- <item name="android:windowNoTitle">true</item>
- <item name="windowActionBar">false</item>
+ <style name="UnifiedEmailTheme.Appcompat.Toolbar" parent="@style/Theme.AppCompat.Light.NoActionBar">
+ <item name="actionModeBackground">@color/action_mode_background</item>
+ <item name="actionOverflowButtonStyle">@style/ActionBarOverflowButtonStyle.Appcompat</item>
+ <item name="colorPrimary">@color/actionbar_color</item>
+ <!-- Used by the StatusBar and NavBar (currently broken?) -->
+ <item name="colorPrimaryDark">@color/statusbar_color</item>
+ <item name="colorAccent">@color/accent_blue</item>
+ <item name="homeAsUpIndicator">@drawable/ic_arrow_back_wht_24dp</item>
<item name="windowActionModeOverlay">true</item>
</style>