From ff160774714539723a16b9c25cfb6e579f8e716b Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sat, 18 Jul 2015 19:18:29 -0700 Subject: Revert hiding bottom bar since it still has issues --- .../daneren2005/dsub/activity/SubsonicFragmentActivity.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'app/src') diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java index e5144f6f..bb54f3cc 100644 --- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java +++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java @@ -828,9 +828,6 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo DownloadService downloadService = getDownloadService(); PlayerState state = downloadService.getPlayerState(); if(currentPlaying == this.currentPlaying && state == currentState) { - if(currentPlaying == null && slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) { - slideUpPanel.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN); - } return; } else { this.currentPlaying = currentPlaying; @@ -841,12 +838,9 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo song = currentPlaying.getSong(); trackView.setText(song.getTitle()); artistView.setText(song.getArtist()); - - if(slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.HIDDEN) { - slideUpPanel.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED); - } - } else if(slideUpPanel.getPanelState() == SlidingUpPanelLayout.PanelState.COLLAPSED) { - slideUpPanel.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN); + } else { + trackView.setText(R.string.main_title); + artistView.setText(R.string.main_artist); } if (coverArtView != null) { -- cgit v1.2.3