aboutsummaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-04-26 16:41:42 -0700
committerScott Jackson <daneren2005@gmail.com>2014-04-26 16:41:42 -0700
commit3866cadd13a6a2ac65d617d14bef749688f7db50 (patch)
tree05eaffadba6e99223245b45f233b18ed71e1d672 /res/layout
parent161b1ae1823091ee1eb7b03b340dc7576ecd4cfa (diff)
downloaddsub-3866cadd13a6a2ac65d617d14bef749688f7db50.tar.gz
dsub-3866cadd13a6a2ac65d617d14bef749688f7db50.tar.bz2
dsub-3866cadd13a6a2ac65d617d14bef749688f7db50.zip
Fixed having both GridView and ListView together by putting GridView in ListView's header
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/grid_view.xml10
-rw-r--r--res/layout/select_album.xml16
2 files changed, 12 insertions, 14 deletions
diff --git a/res/layout/grid_view.xml b/res/layout/grid_view.xml
new file mode 100644
index 00000000..549f9ae5
--- /dev/null
+++ b/res/layout/grid_view.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<github.daneren2005.dsub.view.UnscrollableGridView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/gridview"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:numColumns="auto_fit"
+ android:horizontalSpacing="10dp"
+ android:verticalSpacing="10dp"
+ android:gravity="center"
+ android:stretchMode="columnWidth"/> \ No newline at end of file
diff --git a/res/layout/select_album.xml b/res/layout/select_album.xml
index 53b6bb63..954fbcf6 100644
--- a/res/layout/select_album.xml
+++ b/res/layout/select_album.xml
@@ -25,23 +25,11 @@
android:layout_height="wrap_content"
android:padding="10dip"/>
- <GridView
- android:id="@+id/select_album_albums"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:numColumns="auto_fit"
- android:horizontalSpacing="10dp"
- android:verticalSpacing="10dp"
- android:gravity="center"
- android:stretchMode="columnWidth"/>
-
- <com.mobeta.android.dslv.DragSortListView
- style="@style/DragDropListView"
+ <ListView
android:id="@+id/select_album_entries"
android:textFilterEnabled="true"
android:layout_width="fill_parent"
android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"/>
+ android:layout_weight="1.0"/>
</LinearLayout>
</android.support.v4.widget.SwipeRefreshLayout> \ No newline at end of file