diff options
| author | lookshe <github@lookshe.org> | 2015-08-16 18:45:08 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-08-16 18:45:08 +0200 |
| commit | 89b28a496542b1995f60efb6b8937d11adf8e425 (patch) | |
| tree | 2039e26dd5d3fdd8ce3ce277ff1bff8324f32f6e /src/main/res/layout | |
| parent | a76de90fe7a53220e9358d38fa7b47b63f7694fe (diff) | |
| parent | 0321ebb7a6785b4673376f9e6458e41dd96b2230 (diff) | |
Merge branch 'trz/rebase' into trz/rename
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index bb706e5b..0a69f508 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -5,6 +5,13 @@ android:layout_height="match_parent" android:background="@color/grey200" > + <android.support.v4.widget.SwipeRefreshLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/snackbar" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:id="@+id/swipe_refresh_container"> <ListView android:id="@+id/messages_view" android:layout_width="fill_parent" @@ -20,6 +27,7 @@ android:transcriptMode="normal" tools:listitem="@layout/message_sent" > </ListView> + </android.support.v4.widget.SwipeRefreshLayout> <RelativeLayout android:id="@+id/textsend" |