updates to conversation menu, and updating of group info

// FREEBIE

res/layout/group_create_activity.xml

@@ -25,7 +25,7 @@
                 android:layout_height="70dp"
                 position="bottom_right"
                 android:layout_marginRight="10dp"
-                android:src="@drawable/icon"
+                android:src="@drawable/ic_group_photo"
                 android:contentDescription="@string/GroupCreateActivity_avatar_content_description" />
 
             <EditText android:id="@+id/group_name"

res/menu/conversation_push_group_options.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:id="@+id/menu_edit_group"
+          android:title="@string/conversation__menu_update_group"
+          android:showAsAction="collapseActionView" />
+
+    <item android:id="@+id/menu_leave"
+          android:title="@string/conversation__menu_leave_group"
+          android:showAsAction="collapseActionView"/>
+
+</menu>

res/menu/conversation_secure_identity.xml

@@ -7,10 +7,6 @@
           <menu>
               <item android:title="@string/conversation_secure_verified__menu_verify_recipient"
                     android:id="@+id/menu_verify_recipient"/>
-
-              <item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
-                    android:id="@+id/menu_abort_session"/>
-
           </menu>
     </item>
 </menu>

res/menu/conversation_secure_no_identity.xml

@@ -8,10 +8,6 @@
               <item android:title="@string/conversation_secure_verified__menu_no_identity"
                     android:enabled="false"
                     android:id="@+id/menu_no_identity" />
-
-              <item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
-                    android:id="@+id/menu_abort_session"/>
-
           </menu>
     </item>
 </menu>

res/menu/conversation_secure_sms.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="@string/conversation_secure_verified__menu_security"
+          android:id="@+id/menu_security"
+          android:icon="?menu_lock_icon"
+          android:showAsAction="ifRoom">
+          <menu>
+              <item android:title="@string/conversation_secure_verified__menu_abort_secure_session"
+                    android:id="@+id/menu_abort_session"/>
+
+          </menu>
+    </item>
+</menu>

res/values/strings.xml

@@ -124,10 +124,12 @@
 
     <!-- GroupCreateActivity -->
     <string name="GroupCreateActivity_actionbar_title">New Group</string>
+    <string name="GroupCreateActivity_actionbar_update_title">Update Group</string>
     <string name="GroupCreateActivity_group_name_hint">Group Name</string>
     <string name="GroupCreateActivity_actionbar_mms_title">New MMS Group</string>
     <string name="GroupCreateActivity_contacts_dont_support_push">You have selected a contact that doesn\'t support TextSecure groups, so this group will be MMS.</string>
     <string name="GroupCreateActivity_you_dont_support_push">You\'re not registered for using the data channel, so TextSecure groups are disabled.</string>
+    <string name="GroupCreateActivity_you_dont_own_this_group">You\'re not the owner of this group, so you cannot edit the title or picture.</string>
     <string name="GroupCreateActivity_contacts_mms_exception">An unexpected error happened that has made group creation fail.</string>
     <string name="GroupCreateActivity_contacts_no_members">You need at least one person in your group!</string>
     <string name="GroupCreateActivity_contacts_invalid_number">One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.</string>
@@ -563,7 +565,8 @@
 
     <!-- recipients_panel -->
     <string name="recipients_panel__to">To</string>
-    
+    <string name="recipients_panel__add_member">Add member</string>
+
     <!-- review_identities -->
     <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">You don\'t currently have any identity keys in your trust database.</string>
 
@@ -725,6 +728,8 @@
     
     <!-- conversation -->
     <string name="conversation__menu_add_attachment">Add attachment</string>
+    <string name="conversation__menu_update_group">Update Group</string>
+    <string name="conversation__menu_leave_group">Leave Group</string>
     <string name="conversation__menu_add_contact_info">Add contact info</string>
     <string name="conversation__menu_delete_thread">Delete thread</string>