aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android/src/github
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-05-24 08:25:29 -0700
committerScott Jackson <daneren2005@gmail.com>2013-05-24 08:25:29 -0700
commitdf400f57394badb6f249205074662ac3a00e6da5 (patch)
tree8403f854aac17dcfcd5b6758e0a01fafd1fca09f /subsonic-android/src/github
parent28c9018fc928150a91299e90c1070aa2debb2955 (diff)
downloaddsub-df400f57394badb6f249205074662ac3a00e6da5.tar.gz
dsub-df400f57394badb6f249205074662ac3a00e6da5.tar.bz2
dsub-df400f57394badb6f249205074662ac3a00e6da5.zip
Revert black modifications, add new separate black theme
Diffstat (limited to 'subsonic-android/src/github')
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java4
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java4
2 files changed, 8 insertions, 0 deletions
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
index 4fdf8431..88e487f1 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -306,10 +306,14 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
String activeTheme = Util.getTheme(this);
if ("dark".equals(activeTheme)) {
setTheme(R.style.Theme_DSub_Dark);
+ } else if ("black".equals(activeTheme)) {
+ setTheme(R.style.Theme_DSub_Black);
} else if ("light".equals(activeTheme)) {
setTheme(R.style.Theme_DSub_Light);
} else if ("dark_fullscreen".equals(activeTheme)) {
setTheme(R.style.Theme_DSub_Dark_Fullscreen);
+ } else if ("black_fullscreen".equals(activeTheme)) {
+ setTheme(R.style.Theme_DSub_Black_Fullscreen);
} else if ("light_fullscreen".equals(activeTheme)) {
setTheme(R.style.Theme_DSub_Light_Fullscreen);
} else if("holo".equals(activeTheme)) {
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index cb4cac6f..0c8d130a 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -277,10 +277,14 @@ public class SubsonicActivity extends SherlockFragmentActivity implements OnItem
theme = Util.getTheme(this);
if ("dark".equals(theme)) {
setTheme(R.style.Theme_DSub_Dark);
+ } else if ("black".equals(theme)) {
+ setTheme(R.style.Theme_DSub_Black);
} else if ("light".equals(theme)) {
setTheme(R.style.Theme_DSub_Light);
} else if ("dark_fullscreen".equals(theme)) {
setTheme(R.style.Theme_DSub_Dark_Fullscreen);
+ } else if ("black_fullscreen".equals(theme)) {
+ setTheme(R.style.Theme_DSub_Black_Fullscreen);
} else if ("light_fullscreen".equals(theme)) {
setTheme(R.style.Theme_DSub_Light_Fullscreen);
} else if("holo".equals(theme)) {