aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android
diff options
context:
space:
mode:
Diffstat (limited to 'subsonic-android')
-rw-r--r--subsonic-android/res/drawable/background.pngbin0 -> 1701 bytes
-rw-r--r--subsonic-android/res/values/arrays.xml4
-rw-r--r--subsonic-android/res/values/strings.xml3
-rw-r--r--subsonic-android/res/values/styles.xml14
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java4
5 files changed, 24 insertions, 1 deletions
diff --git a/subsonic-android/res/drawable/background.png b/subsonic-android/res/drawable/background.png
new file mode 100644
index 00000000..07d6a9cc
--- /dev/null
+++ b/subsonic-android/res/drawable/background.png
Binary files differ
diff --git a/subsonic-android/res/values/arrays.xml b/subsonic-android/res/values/arrays.xml
index 54c5b6c4..0ebb02bd 100644
--- a/subsonic-android/res/values/arrays.xml
+++ b/subsonic-android/res/values/arrays.xml
@@ -4,15 +4,19 @@
<string-array name="themeValues">
<item>light</item>
<item>dark</item>
+ <item>holo</item>
<item>light_fullscreen</item>
<item>dark_fullscreen</item>
+ <item>holo_fullscreen</item>
</string-array>
<string-array name="themeNames">
<item>@string/settings.theme_light</item>
<item>@string/settings.theme_dark</item>
+ <item>@string/settings.theme_holo</item>
<item>@string/settings.theme_light_fullscreen</item>
<item>@string/settings.theme_dark_fullscreen</item>
+ <item>@string/settings.theme_holo_fullscreen</item>
</string-array>
<string-array name="sleepTimerValues">
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index ecfd95de..dfd5e5f3 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -161,11 +161,12 @@
<string name="settings.invalid_username">Please specify a valid username (no trailing spaces).</string>
<string name="settings.appearance_title">Appearance</string>
<string name="settings.theme_title">Theme</string>
- <string name="settings.theme_wheat">Wheat</string>
<string name="settings.theme_light">Light</string>
<string name="settings.theme_dark">Dark</string>
+ <string name="settings.theme_holo">Holo</string>
<string name="settings.theme_light_fullscreen">Light Fullscreen</string>
<string name="settings.theme_dark_fullscreen">Dark Fullscreen</string>
+ <string name="settings.theme_holo_fullscreen">Holo Fullscreen</string>
<string name="settings.network_title">Network</string>
<string name="settings.max_bitrate_wifi">Max bitrate - Wi-Fi</string>
<string name="settings.max_bitrate_mobile">Max bitrate - Mobile</string>
diff --git a/subsonic-android/res/values/styles.xml b/subsonic-android/res/values/styles.xml
index 4a26dc68..63123da3 100644
--- a/subsonic-android/res/values/styles.xml
+++ b/subsonic-android/res/values/styles.xml
@@ -10,6 +10,12 @@
<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
<item name="android:textColorSecondary">@color/cyan</item>
</style>
+ <style name="Theme.DSub.Holo" parent="Theme.Sherlock.ForceOverflow">
+ <item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
+ <item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
+ <item name="android:textColorSecondary">@color/cyan</item>
+ <item name="android:windowBackground">@drawable/background</item>
+ </style>
<style name="Theme.DSub.Light.Fullscreen" parent="Theme.DSub.Light">
<item name="android:windowFullscreen">true</item>
@@ -17,6 +23,9 @@
<style name="Theme.DSub.Dark.Fullscreen" parent="Theme.DSub.Dark">
<item name="android:windowFullscreen">true</item>
</style>
+ <style name="Theme.DSub.Holo.Fullscreen" parent="Theme.DSub.Holo">
+ <item name="android:windowFullscreen">true</item>
+ </style>
<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
<item name="background">@drawable/menubar_button_normal</item>
@@ -27,4 +36,9 @@
<item name="background">@drawable/menubar_button_normal</item>
<item name="android:background">@drawable/menubar_button_normal</item>
</style>
+
+ <style name="Widget.DSub.ActionBarStyle.Holo" parent="Widget.Sherlock.ActionBar.Solid">
+ <item name="background">@android:color/transparent</item>
+ <item name="android:background">@android:color/transparent</item>
+ </style>
</resources>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
index 7d54908b..c65e3661 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
@@ -180,6 +180,10 @@ public class SubsonicTabActivity extends SherlockActivity {
setTheme(R.style.Theme_DSub_Dark_Fullscreen);
} else if ("light_fullscreen".equals(theme)) {
setTheme(R.style.Theme_DSub_Light_Fullscreen);
+ } else if("holo".equals(theme)) {
+ setTheme(R.style.Theme_DSub_Holo);
+ } else if("holo_fullscreen".equals(theme)) {
+ setTheme(R.style.Theme_DSub_Holo_Fullscreen);
}else {
setTheme(R.style.Theme_DSub_Light);
}