aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2012-09-14 22:09:39 -0700
committerScott Jackson <daneren2005@gmail.com>2012-09-14 22:09:39 -0700
commita52052785e9c54b96b56ee73dab798c727edcf12 (patch)
tree068087605b5b2dd12af322d197a4b3eb77f6bf1c
parenta68545e6192ebf856917a2bd8ac82518fa4be3a4 (diff)
downloaddsub-a52052785e9c54b96b56ee73dab798c727edcf12.tar.gz
dsub-a52052785e9c54b96b56ee73dab798c727edcf12.tar.bz2
dsub-a52052785e9c54b96b56ee73dab798c727edcf12.zip
DownloadActivity show ActionBar on playlist view
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.pngbin3820 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/ic_menu_help.pngbin3468 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.pngbin2546 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/ic_menu_save.pngbin1899 -> 0 bytes
-rw-r--r--subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.pngbin1497 -> 0 bytes
-rw-r--r--subsonic-android/res/menu/nowplaying.xml24
-rw-r--r--subsonic-android/res/menu/nowplaying_context.xml42
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java4
8 files changed, 25 insertions, 45 deletions
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png
deleted file mode 100644
index 28cad85e..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_exit.png
+++ /dev/null
Binary files differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png
deleted file mode 100644
index 7e14e95d..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_help.png
+++ /dev/null
Binary files differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png
deleted file mode 100644
index 112196be..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_remove_all.png
+++ /dev/null
Binary files differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png
deleted file mode 100644
index 34f6e01a..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_save.png
+++ /dev/null
Binary files differ
diff --git a/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png b/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png
deleted file mode 100644
index db9235fc..00000000
--- a/subsonic-android/res/drawable-hdpi-v4/ic_menu_screen_on_off.png
+++ /dev/null
Binary files differ
diff --git a/subsonic-android/res/menu/nowplaying.xml b/subsonic-android/res/menu/nowplaying.xml
index 28bcb5ef..a880438e 100644
--- a/subsonic-android/res/menu/nowplaying.xml
+++ b/subsonic-android/res/menu/nowplaying.xml
@@ -3,25 +3,25 @@
<item
android:id="@+id/menu_shuffle"
- android:icon="@drawable/ic_menu_shuffle"
+ android:icon="@drawable/action_shuffle"
android:title="@string/download.menu_shuffle"
- />
+ android:showAsAction="always|withText"/>
+
+ <item
+ android:id="@+id/menu_remove_all"
+ android:icon="@drawable/action_remove_all"
+ android:title="@string/download.menu_remove_all"
+ android:showAsAction="always|withText"/>
<item
android:id="@+id/menu_save_playlist"
- android:icon="@drawable/ic_menu_save"
+ android:icon="@drawable/action_save"
android:title="@string/download.menu_save"
- />
-
- <item
- android:id="@+id/menu_remove_all"
- android:icon="@drawable/ic_menu_remove_all"
- android:title="@string/download.menu_remove_all"
- />
+ android:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_screen_on_off"
- android:icon="@drawable/ic_menu_screen_on_off"
+ android:icon="@drawable/action_screen_on_off"
android:title="@string/download.menu_screen_on"
- />
+ android:showAsAction="ifRoom|withText"/>
</menu>
diff --git a/subsonic-android/res/menu/nowplaying_context.xml b/subsonic-android/res/menu/nowplaying_context.xml
index 04e56e1a..eeb49a26 100644
--- a/subsonic-android/res/menu/nowplaying_context.xml
+++ b/subsonic-android/res/menu/nowplaying_context.xml
@@ -1,39 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:id="@+id/menu_show_album"
- android:title="@string/download.menu_show_album"
- />
-
- <item
- android:id="@+id/menu_lyrics"
- android:title="@string/download.menu_lyrics"
- />
-
- <item
- android:id="@+id/menu_remove"
- android:title="@string/download.menu_remove"
- />
-
<item
- android:id="@+id/menu_delete"
- android:title="@string/download.menu_delete"
- />
+ android:id="@+id/menu_show_album"
+ android:title="@string/download.menu_show_album"/>
- <item
- android:id="@+id/menu_remove_all"
- android:title="@string/download.menu_remove_all"
- />
+ <item
+ android:id="@+id/menu_lyrics"
+ android:title="@string/download.menu_lyrics"/>
- <item
- android:id="@+id/menu_shuffle"
- android:title="@string/download.menu_shuffle"
- />
+ <item
+ android:id="@+id/menu_remove"
+ android:title="@string/download.menu_remove"/>
- <item
- android:id="@+id/menu_save_playlist"
- android:title="@string/download.menu_save"
- />
-
+ <item
+ android:id="@+id/menu_delete"
+ android:title="@string/download.menu_delete"/>
</menu>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
index 2f20c20e..9b65b351 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
@@ -645,8 +645,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
buttonBarFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_in));
buttonBarFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_out));
buttonBarFlipper.setDisplayedChild(0);
-
-
+ getSupportActionBar().hide();
} else {
playlistFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_in));
playlistFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_out));
@@ -654,6 +653,7 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
buttonBarFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_in));
buttonBarFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_out));
buttonBarFlipper.setDisplayedChild(1);
+ getSupportActionBar().show();
}
}