Always display tabs on Now Playing

1 files changed, 0 insertions, 18 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
index bd0a9e48..059b6189 100644
--- a/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
@@ -87,11 +87,8 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
     private static final int COLOR_BUTTON_DISABLED = Color.rgb(164, 166, 158);
 
     private ViewFlipper playlistFlipper;
-    private ViewFlipper buttonBarFlipper;
     private TextView emptyTextView;
     private TextView songTitleTextView;
-    private TextView albumTextView;
-    private TextView artistTextView;
     private ImageView albumArtImageView;
     private ListView playlistView;
     private TextView positionTextView;
@@ -136,11 +133,8 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
         gestureScanner = new GestureDetector(this);
 
         playlistFlipper = (ViewFlipper) findViewById(R.id.download_playlist_flipper);
-        buttonBarFlipper = (ViewFlipper) findViewById(R.id.download_button_bar_flipper);
         emptyTextView = (TextView) findViewById(R.id.download_empty);
         songTitleTextView = (TextView) findViewById(R.id.download_song_title);
-        albumTextView = (TextView) findViewById(R.id.download_album);
-        artistTextView = (TextView) findViewById(R.id.download_artist);
         albumArtImageView = (ImageView) findViewById(R.id.download_album_art_image);
         positionTextView = (TextView) findViewById(R.id.download_position);
         durationTextView = (TextView) findViewById(R.id.download_duration);
@@ -189,7 +183,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
         equalizerButton.setOnTouchListener(touchListener);
         visualizerButton.setOnTouchListener(touchListener);
         jukeboxButton.setOnTouchListener(touchListener);
-        buttonBarFlipper.setOnTouchListener(touchListener);
         emptyTextView.setOnTouchListener(touchListener);
         albumArtImageView.setOnTouchListener(touchListener);
 
@@ -399,7 +392,6 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
         DownloadService downloadService = getDownloadService();
         if (downloadService == null || downloadService.getCurrentPlaying() == null) {
             playlistFlipper.setDisplayedChild(1);
-            buttonBarFlipper.setDisplayedChild(1);
         }
 
         onDownloadListChanged();
@@ -684,16 +676,10 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
             playlistFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_in));
             playlistFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_out));
             playlistFlipper.setDisplayedChild(0);
-            buttonBarFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_in));
-            buttonBarFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_down_out));
-            buttonBarFlipper.setDisplayedChild(0);
         } else {
             playlistFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_in));
             playlistFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_out));
             playlistFlipper.setDisplayedChild(1);
-            buttonBarFlipper.setInAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_in));
-            buttonBarFlipper.setOutAnimation(AnimationUtils.loadAnimation(this, R.anim.push_up_out));
-            buttonBarFlipper.setDisplayedChild(1);
         }
     }
 
@@ -754,14 +740,10 @@ public class DownloadActivity extends SubsonicTabActivity implements OnGestureLi
         if (currentPlaying != null) {
             MusicDirectory.Entry song = currentPlaying.getSong();
             songTitleTextView.setText(song.getTitle());
-            albumTextView.setText(song.getAlbum());
-            artistTextView.setText(song.getArtist());
             getImageLoader().loadImage(albumArtImageView, song, true, true);
             starButton.setImageResource(song.isStarred() ? android.R.drawable.btn_star_big_on : android.R.drawable.btn_star_big_off);
         } else {
             songTitleTextView.setText(null);
-            albumTextView.setText(null);
-            artistTextView.setText(null);
             getImageLoader().loadImage(albumArtImageView, null, true, false);
             starButton.setImageResource(android.R.drawable.btn_star_big_off);
         }