aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-11-14 11:50:08 -0800
committerScott Jackson <daneren2005@gmail.com>2015-11-14 11:50:08 -0800
commit7a43be1cc320c5aa36e5114538553f08e1fcf5e2 (patch)
tree5489a51001be15a2ae9a17c311547c773f0ccfaf /app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
parentd0d6b87b562d350cfcac0296d973c6bb969d0c7a (diff)
downloaddsub-7a43be1cc320c5aa36e5114538553f08e1fcf5e2.tar.gz
dsub-7a43be1cc320c5aa36e5114538553f08e1fcf5e2.tar.bz2
dsub-7a43be1cc320c5aa36e5114538553f08e1fcf5e2.zip
On tablets show main's albums on own since they can fully use space
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
index e190e4c1..92d9deed 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -699,7 +699,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
currentFragment.setPrimaryFragment(true);
supportInvalidateOptionsMenu();
- if(secondaryContainer == null) {
+ if(secondaryContainer == null || oldFragment.isAlwaysFullscreen()) {
FragmentTransaction trans = getSupportFragmentManager().beginTransaction();
trans.setCustomAnimations(R.anim.enter_from_right, R.anim.exit_to_left, R.anim.enter_from_left, R.anim.exit_to_right);
trans.hide(oldFragment);
@@ -761,7 +761,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
currentFragment.setPrimaryFragment(true, false);
supportInvalidateOptionsMenu();
- if(secondaryContainer == null) {
+ if(secondaryContainer == null || currentFragment.isAlwaysFullscreen()) {
FragmentTransaction trans = getSupportFragmentManager().beginTransaction();
trans.setCustomAnimations(R.anim.enter_from_left, R.anim.exit_to_right, R.anim.enter_from_right, R.anim.exit_to_left);
trans.remove(oldFrag);
@@ -775,7 +775,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
trans.remove(oldFrag);
// Only switch places if there is a backstack, otherwise primary container is correct
- if(backStack.size() > 0) {
+ if(backStack.size() > 0 && !backStack.get(backStack.size() - 1).isAlwaysFullscreen()) {
trans.setCustomAnimations(0, 0, 0, 0);
// Add current left fragment to right side
trans.remove(currentFragment);