From 366b3d35ae8d3a410678e90f3382e457c7d9445e Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Mon, 27 Apr 2015 18:09:40 -0700
Subject: Merge work for #259 after project structure change

---
 app/src/main/res/values/styles.xml |  6 ++++++
 app/src/main/res/values/themes.xml | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)

(limited to 'app/src/main/res/values')

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 43271afd..061cfae7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,6 +23,12 @@
         <item name="android:layout_width">@dimen/Button.Small</item>
         <item name="android:layout_height">@dimen/Button.Small</item>
     </style>
+
+	<style name="PlaybackControl.Match" parent="@style/PlaybackControl">
+		<item name="android:padding">4dip</item>
+		<item name="android:layout_height">match_parent</item>
+		<item name="android:layout_width">wrap_content</item>
+	</style>
 	
 	<style name="MenuBarButton" parent="@style/BasicButton">
         <item name="android:layout_width">0dip</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 78a2c34d..50d2d171 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -76,6 +76,23 @@
 	<style name="Theme.DSub.Holo" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@drawable/background</item>
 	</style>
+
+	<style name="Theme.DSub.Light.No_Actionbar" parent="Theme.DSub.Light">
+		<item name="windowActionBar">false</item>
+		<item name="windowNoTitle">true</item>
+	</style>
+	<style name="Theme.DSub.Black.No_Actionbar" parent="Theme.DSub.Black">
+		<item name="windowActionBar">false</item>
+		<item name="windowNoTitle">true</item>
+	</style>
+	<style name="Theme.DSub.Dark.No_Actionbar" parent="Theme.DSub.Dark">
+		<item name="windowActionBar">false</item>
+		<item name="windowNoTitle">true</item>
+	</style>
+	<style name="Theme.DSub.Holo.No_Actionbar" parent="Theme.DSub.Holo">
+		<item name="windowActionBar">false</item>
+		<item name="windowNoTitle">true</item>
+	</style>
 	
 	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
 		<item name="background">@android:color/transparent</item>
-- 
cgit v1.2.3