diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-04-19 13:21:36 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-04-19 13:21:36 -0700 |
| commit | 2afc4b04e4774f5a7b8ce4cf5b907c0d2e8fbe98 (patch) | |
| tree | 16d14cdca370cf35dea24427c7aa445868128b8d /res/layout | |
| parent | ade2ba555cc7ef5a5173f75f4d67b2c5db495795 (diff) | |
| parent | e4fd975a5167450fe18c542f2b3cf1fdf907cbdb (diff) | |
| download | dsub-2afc4b04e4774f5a7b8ce4cf5b907c0d2e8fbe98.tar.gz dsub-2afc4b04e4774f5a7b8ce4cf5b907c0d2e8fbe98.tar.bz2 dsub-2afc4b04e4774f5a7b8ce4cf5b907c0d2e8fbe98.zip | |
Merge branch 'PullRefresh' of https://github.com/daneren2005/Subsonic
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/abstract_list_fragment.xml | 15 | ||||
| -rw-r--r-- | res/layout/chat.xml | 16 | ||||
| -rw-r--r-- | res/layout/select_album.xml | 19 |
3 files changed, 35 insertions, 15 deletions
diff --git a/res/layout/abstract_list_fragment.xml b/res/layout/abstract_list_fragment.xml index bfce4792..3923f120 100644 --- a/res/layout/abstract_list_fragment.xml +++ b/res/layout/abstract_list_fragment.xml @@ -20,10 +20,17 @@ android:text="@string/common.empty"
android:visibility="gone" />
- <ListView
- android:id="@+id/fragment_list"
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/refresh_layout"
android:layout_width="fill_parent"
android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"/>
+ android:layout_weight="1.0">
+
+ <ListView
+ android:id="@+id/fragment_list"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:fastScrollEnabled="true"/>
+
+ </android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
diff --git a/res/layout/chat.xml b/res/layout/chat.xml index 9b8f7d17..f2c1c3fd 100644 --- a/res/layout/chat.xml +++ b/res/layout/chat.xml @@ -7,12 +7,18 @@ <include layout="@layout/tab_progress" /> - <ListView - android:id="@+id/chat_entries" + <android.support.v4.widget.SwipeRefreshLayout + android:id="@+id/refresh_layout" android:layout_width="fill_parent" android:layout_height="0dip" - android:layout_weight="1.0" - android:textFilterEnabled="true" /> + android:layout_weight="1.0"> + + <ListView + android:id="@+id/chat_entries" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:textFilterEnabled="true" /> + </android.support.v4.widget.SwipeRefreshLayout> <LinearLayout android:layout_height="4dip" @@ -32,7 +38,7 @@ android:layout_weight="1" android:autoLink="all" android:hint="@string/chat.send_a_message" - android:inputType="textEmailAddress|textMultiLine" + android:inputType="textEmailAddress|textMultiLine" android:linksClickable="true" android:paddingBottom="10dip" android:paddingTop="10dip" /> diff --git a/res/layout/select_album.xml b/res/layout/select_album.xml index 01df495a..55747a18 100644 --- a/res/layout/select_album.xml +++ b/res/layout/select_album.xml @@ -20,12 +20,19 @@ android:layout_height="wrap_content"
android:padding="10dip"/>
- <com.mobeta.android.dslv.DragSortListView
- style="@style/DragDropListView"
- android:id="@+id/select_album_entries"
- android:textFilterEnabled="true"
+ <android.support.v4.widget.SwipeRefreshLayout
+ android:id="@+id/refresh_layout"
android:layout_width="fill_parent"
android:layout_height="0dip"
- android:layout_weight="1.0"
- android:fastScrollEnabled="true"/>
+ android:layout_weight="1.0">
+
+ <com.mobeta.android.dslv.DragSortListView
+ style="@style/DragDropListView"
+ android:id="@+id/select_album_entries"
+ android:textFilterEnabled="true"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:fastScrollEnabled="true"/>
+
+ </android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
\ No newline at end of file |