[Android] Fix conflicts with master
Nicolas Pomepuy
git at videolan.org
Tue Apr 2 16:59:49 CEST 2019
vlc-android | branch: master | Nicolas Pomepuy <nicolas.pomepuy at gmail.com> | Fri Feb 15 13:11:24 2019 +0100| [8eba4a48067623f22cafb2c1bc3a31457901acbe] | committer: Geoffrey Métais
Fix conflicts with master
> https://code.videolan.org/videolan/vlc-android/commit/8eba4a48067623f22cafb2c1bc3a31457901acbe
---
vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.java b/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.java
index 467c6aff2..3516589e5 100644
--- a/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/PlaylistActivity.java
@@ -128,7 +128,7 @@ public class PlaylistActivity extends AudioPlayerContainerActivity implements IE
}
}
});
- mAdapter = new AudioBrowserAdapter(MediaLibraryItem.TYPE_MEDIA, this);
+ mAdapter = new AudioBrowserAdapter(MediaLibraryItem.TYPE_MEDIA, this,false, true);
mItemTouchHelper = new ItemTouchHelper(new SwipeDragItemTouchHelperCallback(mAdapter));
mItemTouchHelper.attachToRecyclerView(mBinding.songs);
More information about the Android
mailing list