aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-01-07 14:01:48 -0800
committerScott Jackson <daneren2005@gmail.com>2016-01-07 14:01:48 -0800
commit3a046f4d90b1705ecca24877461367052c778dfd (patch)
treec0cdbddb51e1705d9d9c7a97d4b8211da79c66eb /app/src/main/res/values
parent7c37b3f893b0dda5f887dbd7af2787bcb904b168 (diff)
parent5b05b0334ab836abf40fab6bddf7b149fd320224 (diff)
downloaddsub-3a046f4d90b1705ecca24877461367052c778dfd.tar.gz
dsub-3a046f4d90b1705ecca24877461367052c778dfd.tar.bz2
dsub-3a046f4d90b1705ecca24877461367052c778dfd.zip
Merge branch 'Kakadua-master'
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/attrs.xml1
-rw-r--r--app/src/main/res/values/themes.xml3
2 files changed, 4 insertions, 0 deletions
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4206d9f0..d97a3b21 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -56,6 +56,7 @@
<attr name="drawerTitleStyle" format="reference"/>
<attr name="drawerSubtitleStyle" format="reference"/>
<attr name="cardBackgroundDrawable" format="reference"/>
+ <attr name="drawerHeaderBackground" format="reference"/>
<declare-styleable name="SeekBarPreference">
<attr name="min" format="integer"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c125c18a..12784b94 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -63,6 +63,7 @@
<item name="windowActionModeOverlay">true</item>
<item name="actionModeBackground">?attr/colorPrimary</item>
<item name="cardBackgroundDrawable">@drawable/card_rounded_corners_light</item>
+ <item name="drawerHeaderBackground">@drawable/drawer_header_light</item>
</style>
<style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat">
<item name="offline_icon">@drawable/main_offline_dark</item>
@@ -126,6 +127,7 @@
<item name="windowActionModeOverlay">true</item>
<item name="actionModeBackground">?attr/colorPrimary</item>
<item name="cardBackgroundDrawable">@drawable/card_rounded_corners_black</item>
+ <item name="drawerHeaderBackground">@drawable/drawer_header_dark</item>
</style>
<style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base">
</style>
@@ -141,6 +143,7 @@
<item name="colorPrimaryDark">@color/holoPrimaryDark</item>
<item name="colorAccent">@color/holoAccent</item>
<item name="actionbarBackgroundColor">@color/holoPrimary</item>
+ <item name="drawerHeaderBackground">@drawable/drawer_header_holo</item>
</style>
<style name="Theme.DSub.Light.No_Actionbar" parent="Theme.DSub.Light">