aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-02 16:13:25 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-10 00:53:43 +0200
commit502a1bdb9c3f6ddb8cdcf9be8c20862f4d55feaf (patch)
treebea5682f30103256ba79afcb4435dcec604c3399 /res
parent9260ed404750d7e718e12535030104ff4debda68 (diff)
changed support lib to v13. added tabs and fragments to start conversation activity
Diffstat (limited to 'res')
-rw-r--r--res/layout/activity_start_conversation.xml7
-rw-r--r--res/values/strings.xml4
2 files changed, 10 insertions, 1 deletions
diff --git a/res/layout/activity_start_conversation.xml b/res/layout/activity_start_conversation.xml
new file mode 100644
index 00000000..54341816
--- /dev/null
+++ b/res/layout/activity_start_conversation.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/start_conversation_view_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+</android.support.v4.view.ViewPager> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 80bd2052..78961a56 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,6 +21,7 @@
<string name="title_activity_contact_details">Contact Details</string>
<string name="title_activity_conversations">Conversations</string>
<string name="title_activity_sharewith">Share with Conversation</string>
+ <string name="title_activity_start_conversation">Start Conversation</string>
<string name="just_now">just now</string>
<string name="minute_ago">1 min ago</string>
<string name="minutes_ago">%d mins ago</string>
@@ -254,4 +255,5 @@
<string name="otr_fingerprint">OTR fingerprint</string>
<string name="verify">Verify</string>
<string name="decrypt">Decrypt</string>
-</resources> \ No newline at end of file
+ <string name="conferences">Conferences</string>
+</resources>