summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2014-08-19 21:24:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-19 21:23:09 +0000
commitb7042514fb57f2dadfb984faf5bab73fabf00af0 (patch)
treed817a8e767a625dca2061c980f5aab51957889a7 /res
parent7f0c2ac8a72404aef2f0c1fb163433c4fdfaff38 (diff)
parentd29ff86690bee7c56ca08f4bed4fb1a3924ea853 (diff)
downloadandroid_packages_apps_UnifiedEmail-b7042514fb57f2dadfb984faf5bab73fabf00af0.tar.gz
android_packages_apps_UnifiedEmail-b7042514fb57f2dadfb984faf5bab73fabf00af0.tar.bz2
android_packages_apps_UnifiedEmail-b7042514fb57f2dadfb984faf5bab73fabf00af0.zip
Merge "Set toolbar theme. b/16826009" into ub-gmail-ur14-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/one_pane_activity.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/res/layout/one_pane_activity.xml b/res/layout/one_pane_activity.xml
index 4726508d0..478edb9a9 100644
--- a/res/layout/one_pane_activity.xml
+++ b/res/layout/one_pane_activity.xml
@@ -16,6 +16,7 @@
-->
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -30,7 +31,8 @@
android:id="@+id/mail_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary" />
+ android:background="?attr/colorPrimary"
+ app:theme="?attr/actionBarTheme" />
<FrameLayout
android:layout_width="match_parent"