diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-06-09 17:46:37 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-06-09 17:46:37 -0700 |
| commit | 9d4876f4874d034177c4f012932ca936d85e40ac (patch) | |
| tree | 05a4db08bf5f8471d42dd2a1a8ba352d16b447b7 /app/src/main/res/layout/download_playlist.xml | |
| parent | 6caaca0cecd9f4f60f695a68c72eb662b4a45b34 (diff) | |
| parent | 9f8e9b89bb2d564bcaf00309b38ed9c4d970aeb9 (diff) | |
| download | dsub-9d4876f4874d034177c4f012932ca936d85e40ac.tar.gz dsub-9d4876f4874d034177c4f012932ca936d85e40ac.tar.bz2 dsub-9d4876f4874d034177c4f012932ca936d85e40ac.zip | |
Merge branch 'SlideUpPanel2' into NavigationView
Conflicts:
app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
Diffstat (limited to 'app/src/main/res/layout/download_playlist.xml')
| -rw-r--r-- | app/src/main/res/layout/download_playlist.xml | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/app/src/main/res/layout/download_playlist.xml b/app/src/main/res/layout/download_playlist.xml index 8a73ef3b..afb46081 100644 --- a/app/src/main/res/layout/download_playlist.xml +++ b/app/src/main/res/layout/download_playlist.xml @@ -1,31 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_weight="1"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_weight="1"> <View - android:layout_width="fill_parent" - android:layout_height="1px" - android:background="@color/dividerColor"/> + android:layout_width="fill_parent" + android:layout_height="1px" + android:background="@color/dividerColor"/> <TextView - android:id="@+id/download_empty" - android:text="@string/download.empty" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="10dip"/> + android:id="@+id/download_empty" + android:text="@string/download.empty" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:padding="10dip"/> - <com.mobeta.android.dslv.DragSortListView - style="@style/DragDropListView" + <android.support.v7.widget.RecyclerView android:id="@+id/download_list" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="1" - android:cacheColorHint="#00000000" - android:fastScrollEnabled="true"/> + android:scrollbars="vertical"/> </LinearLayout>
\ No newline at end of file |