diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-07-11 21:32:28 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-07-11 21:32:28 -0700 |
| commit | 06f4da82e83a428b2a4440fef5f8ed110a09ebfb (patch) | |
| tree | 15c3c7a090a7d93af65e7625d8e122c48e975b7c | |
| parent | f605a1868dc9d81b96bb613d5f60e9d86831516f (diff) | |
| parent | 3529619dbf8f2eb6b3c3baee38914dbab5f5ee19 (diff) | |
| download | dsub-06f4da82e83a428b2a4440fef5f8ed110a09ebfb.tar.gz dsub-06f4da82e83a428b2a4440fef5f8ed110a09ebfb.tar.bz2 dsub-06f4da82e83a428b2a4440fef5f8ed110a09ebfb.zip | |
Merge branch 'master' of https://github.com/daneren2005/Subsonic.git
| -rw-r--r-- | subsonic-android/res/layout-land/download.xml | 4 | ||||
| -rw-r--r-- | subsonic-android/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml index a125d77e..0fb80df6 100644 --- a/subsonic-android/res/layout-land/download.xml +++ b/subsonic-android/res/layout-land/download.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:scaleType="fitCenter"/>
+ android:scaleType="fitStart"/>
<include layout="@layout/download_playlist"/>
@@ -131,4 +131,4 @@ </LinearLayout>
</LinearLayout>
-</FrameLayout>
\ No newline at end of file +</FrameLayout>
diff --git a/subsonic-android/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/subsonic-android/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java index 9d34011e..c3771492 100644 --- a/subsonic-android/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java +++ b/subsonic-android/src/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java @@ -221,7 +221,7 @@ public class SelectDirectoryFragment extends SubsonicFragment implements Adapter MusicDirectory.Entry entry = (MusicDirectory.Entry) entryList.getItemAtPosition(info.position);
onCreateContextMenu(menu, view, menuInfo, entry);
- if(!entry.isVideo() && !Util.isOffline(context) && playlistId == null && (podcastId != null || Util.isOffline(context) && podcastId == null)) {
+ if(!entry.isVideo() && !Util.isOffline(context) && playlistId == null && (podcastId == null || Util.isOffline(context) && podcastId != null)) {
menu.removeItem(R.id.song_menu_remove_playlist);
}
if(podcastId != null && !Util.isOffline(context)) {
|