Merged private message activities with contact list.

This makes the contact list behave how alpha testers expected: touching
a contact shows private messages exchanged with the contact.
This commit is contained in:
akwizgran
2013-12-05 12:17:17 +00:00
parent 3e6d7ba66a
commit f383532ecd
16 changed files with 238 additions and 499 deletions

View File

@@ -82,19 +82,15 @@
android:label="@string/add_contact_title" >
</activity>
<activity
android:name=".android.messages.ConversationActivity"
android:name="net.sf.briar.android.contact.ConversationActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name=".android.messages.ConversationListActivity"
android:label="@string/messages_title" >
</activity>
<activity
android:name=".android.messages.ReadPrivateMessageActivity"
android:name="net.sf.briar.android.contact.ReadPrivateMessageActivity"
android:label="@string/app_name" >
</activity>
<activity
android:name=".android.messages.WritePrivateMessageActivity"
android:name="net.sf.briar.android.contact.WritePrivateMessageActivity"
android:label="@string/new_message_title" >
</activity>
</application>