diff options
| -rw-r--r-- | subsonic-android/res/drawable-hdpi-v4/action_toggle_list.png | bin | 0 -> 552 bytes | |||
| -rw-r--r-- | subsonic-android/res/menu/nowplaying.xml | 11 | ||||
| -rw-r--r-- | subsonic-android/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java | 6 |
4 files changed, 11 insertions, 7 deletions
diff --git a/subsonic-android/res/drawable-hdpi-v4/action_toggle_list.png b/subsonic-android/res/drawable-hdpi-v4/action_toggle_list.png Binary files differnew file mode 100644 index 00000000..87f9280f --- /dev/null +++ b/subsonic-android/res/drawable-hdpi-v4/action_toggle_list.png diff --git a/subsonic-android/res/menu/nowplaying.xml b/subsonic-android/res/menu/nowplaying.xml index 62097751..e752eff1 100644 --- a/subsonic-android/res/menu/nowplaying.xml +++ b/subsonic-android/res/menu/nowplaying.xml @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/menu_shuffle" android:icon="@drawable/action_shuffle" android:title="@string/download.menu_shuffle" - android:showAsAction="always|withText"/> + android:showAsAction="ifRoom|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"/> + android:showAsAction="ifRoom|withText"/> <item android:id="@+id/menu_save_playlist" @@ -26,6 +25,12 @@ android:showAsAction="ifRoom|withText"/> <item + android:id="@+id/menu_toggle" + android:icon="@drawable/action_toggle_list" + android:title="@string/download.menu_toggle" + android:showAsAction="always|withText"/> + + <item android:id="@+id/menu_toggle_timer" android:title="@string/download.start_timer"/> diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml index ddaf4a9d..57a91515 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -110,6 +110,7 @@ <string name="download.menu_screen_on">Screen on</string>
<string name="download.menu_screen_off">Screen off</string>
<string name="download.menu_shuffle">Shuffle</string>
+ <string name="download.menu_toggle">Toggle</string>
<string name="download.menu_save">Save playlist</string>
<string name="download.menu_shuffle_notification">Playlist was shuffled</string>
<string name="download.playlist_title">Save playlist</string>
diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java index 0fa1ac94..003b88a0 100644 --- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java +++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java @@ -128,8 +128,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi super.onCreate(savedInstanceState); setTitle(nowPlaying ? "Now Playing" : "Downloading"); setContentView(R.layout.download); - - getSupportActionBar().hide(); WindowManager w = getWindowManager(); Display d = w.getDefaultDisplay(); @@ -623,6 +621,8 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi intent.putExtra(Constants.INTENT_EXTRA_NAME_EXIT, true); Util.startActivityWithoutTransition(this, intent); return true; + case R.id.menu_toggle: + toggleFullscreenAlbumArt(); default: return false; } @@ -681,7 +681,6 @@ 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)); @@ -689,7 +688,6 @@ 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(); } } |
