aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-19 16:16:40 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-19 16:16:40 +0100
commit6be2a08f19f07e9db5da3e644c8d62102fdd27e7 (patch)
tree88a319a2b46dd82ef5b5619605eda0cfe033f13e /res/layout
parent389d4db311f22ceb787976a6c6130bb0260610bb (diff)
otr messages are now ignored if conversations isnt 100% sure the message is ours
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/server_info.xml18
1 files changed, 17 insertions, 1 deletions
diff --git a/res/layout/server_info.xml b/res/layout/server_info.xml
index 8f19cae1..25e5a471 100644
--- a/res/layout/server_info.xml
+++ b/res/layout/server_info.xml
@@ -81,8 +81,24 @@
android:textSize="18sp"/>
<TextView
- android:id="@+id/features_header"
+ android:id="@+id/textView10"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_below="@+id/textView4"
+ android:text="Connected accounts"
+ android:textSize="18sp"/>
+ <TextView
+ android:id="@+id/number_presences"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBaseline="@+id/textView10"
+ android:layout_alignBottom="@+id/textView10"
+ android:layout_alignParentRight="true"
+ android:textSize="18sp"/>
+
+ <TextView
+ android:id="@+id/features_header"
+ android:layout_below="@+id/textView10"
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"