aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2015-12-23 17:10:47 -0800
committerScott Jackson <daneren2005@gmail.com>2015-12-23 17:10:47 -0800
commit64d352511f7ad2ae5927b9f3a5e482f1b6eeaad1 (patch)
treeba3b68eeb5c2cd9d3a5192e1de304559b0cd9f75 /app
parent646bfcbd9e80582aa8a9d63e0f1a7754e0ce1415 (diff)
downloaddsub-64d352511f7ad2ae5927b9f3a5e482f1b6eeaad1.tar.gz
dsub-64d352511f7ad2ae5927b9f3a5e482f1b6eeaad1.tar.bz2
dsub-64d352511f7ad2ae5927b9f3a5e482f1b6eeaad1.zip
Change ActionBar spinner to wrap_content
Diffstat (limited to 'app')
-rw-r--r--app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java2
-rw-r--r--app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java1
-rw-r--r--app/src/main/res/layout/actionbar_spinner.xml2
3 files changed, 4 insertions, 1 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 a58f169b..a0b52a87 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -853,6 +853,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
spinnerAdapter.notifyDataSetChanged();
actionBarSpinner.setSelection(spinnerAdapter.getCount() - 1);
if(!isTv()) {
+ getSupportActionBar().setDisplayShowTitleEnabled(false);
getSupportActionBar().setDisplayShowCustomEnabled(true);
}
@@ -862,6 +863,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
} else if(!isTv()) {
+ getSupportActionBar().setDisplayShowTitleEnabled(true);
getSupportActionBar().setTitle(currentFragment.getTitle());
getSupportActionBar().setDisplayShowCustomEnabled(false);
drawerToggle.setDrawerIndicatorEnabled(true);
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 87a67e80..2f87af68 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
@@ -200,6 +200,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
// Disable custom view before switching
getSupportActionBar().setDisplayShowCustomEnabled(false);
+ getSupportActionBar().setDisplayShowTitleEnabled(true);
bottomBar.setVisibility(View.GONE);
nowPlayingToolbar.setVisibility(View.VISIBLE);
diff --git a/app/src/main/res/layout/actionbar_spinner.xml b/app/src/main/res/layout/actionbar_spinner.xml
index 22fa7f43..023ff957 100644
--- a/app/src/main/res/layout/actionbar_spinner.xml
+++ b/app/src/main/res/layout/actionbar_spinner.xml
@@ -7,7 +7,7 @@
<Spinner
android:id="@+id/spinner"
- android:layout_width="fill_parent"
+ android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:prompt="@string/common.appname"
style="?attr/android:spinnerItemStyle"/>