aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-07-18 19:18:29 -0700
committerScott Jackson <daneren2005@gmail.com>2015-07-18 19:18:29 -0700
commitff160774714539723a16b9c25cfb6e579f8e716b (patch)
treebda2d3450ebcd4f8924fc9d34a8cb433d66463ab /app
parent4c288ccf28d01bd4ff22ebf831074e94db1c917d (diff)
downloaddsub-ff160774714539723a16b9c25cfb6e579f8e716b.tar.gz
dsub-ff160774714539723a16b9c25cfb6e579f8e716b.tar.bz2
dsub-ff160774714539723a16b9c25cfb6e579f8e716b.zip
Revert hiding bottom bar since it still has issues
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java12
1 files changed, 3 insertions, 9 deletions
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) {