diff --git a/res/drawable/ic_baseline_call_split_24.xml b/res/drawable/ic_baseline_call_split_24.xml new file mode 100644 index 0000000000..ada5e609da --- /dev/null +++ b/res/drawable/ic_baseline_call_split_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_file_copy_24.xml b/res/drawable/ic_baseline_file_copy_24.xml new file mode 100644 index 0000000000..0cd5895478 --- /dev/null +++ b/res/drawable/ic_baseline_file_copy_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_key_24.xml b/res/drawable/ic_baseline_key_24.xml new file mode 100644 index 0000000000..2316df207c --- /dev/null +++ b/res/drawable/ic_baseline_key_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_launch_24.xml b/res/drawable/ic_baseline_launch_24.xml new file mode 100644 index 0000000000..455b503a1f --- /dev/null +++ b/res/drawable/ic_baseline_launch_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_reply_24.xml b/res/drawable/ic_baseline_reply_24.xml new file mode 100644 index 0000000000..f49d97d888 --- /dev/null +++ b/res/drawable/ic_baseline_reply_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_select_all_24.xml b/res/drawable/ic_baseline_select_all_24.xml new file mode 100644 index 0000000000..c997121c75 --- /dev/null +++ b/res/drawable/ic_baseline_select_all_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_timer_off_24.xml b/res/drawable/ic_baseline_timer_off_24.xml new file mode 100644 index 0000000000..9216da7aff --- /dev/null +++ b/res/drawable/ic_baseline_timer_off_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/menu/conversation_add_to_contacts.xml b/res/menu/conversation_add_to_contacts.xml deleted file mode 100644 index 498dfb4692..0000000000 --- a/res/menu/conversation_add_to_contacts.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/menu/conversation_callable_insecure.xml b/res/menu/conversation_callable_insecure.xml deleted file mode 100644 index 04be0b922a..0000000000 --- a/res/menu/conversation_callable_insecure.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/res/menu/conversation_callable_secure.xml b/res/menu/conversation_callable_secure.xml deleted file mode 100644 index 6cf92f0624..0000000000 --- a/res/menu/conversation_callable_secure.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/res/menu/conversation_context.xml b/res/menu/conversation_context.xml index 705aac2052..dec8cb8de3 100644 --- a/res/menu/conversation_context.xml +++ b/res/menu/conversation_context.xml @@ -18,7 +18,7 @@ + + @color/text_color_dark_theme @color/text_color_secondary_dark_theme @color/accent @@ -499,17 +504,12 @@ @drawable/ic_group_white_24dp @drawable/ic_search_white_24dp @drawable/ic_call_white_24dp - @drawable/ic_launch_white_24dp @drawable/ic_unlocked_white_24dp @drawable/ic_lock_white_24dp @drawable/ic_lock_white_18dp - @drawable/ic_select_all_white_24dp - @drawable/ic_call_split_white_24dp @drawable/ic_check_white_24dp @drawable/ic_refresh_white_24dp - @drawable/ic_content_copy_white_24dp @drawable/ic_info_outline_white_24dp - @drawable/ic_reply_white_24dp @drawable/ic_audio_dark @drawable/ic_video_dark diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index e5a72655d4..8155c7e341 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -455,7 +455,7 @@ public class ConversationListFragment extends Fragment switch (item.getItemId()) { case R.id.menu_select_all: handleSelectAllThreads(); return true; case R.id.menu_delete_selected: handleDeleteAllSelected(); return true; - case R.id.menu_archive_selected: handleArchiveAllSelected(); return true; +// case R.id.menu_archive_selected: handleArchiveAllSelected(); return true; } return false; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 1a10b5e98a..85469aef1e 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -849,16 +849,16 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity public boolean onOptionsItemSelected(MenuItem item) { super.onOptionsItemSelected(item); switch (item.getItemId()) { - case R.id.menu_call_secure: handleDial(getRecipient(), true); return true; - case R.id.menu_call_insecure: handleDial(getRecipient(), false); return true; +// case R.id.menu_call_secure: handleDial(getRecipient(), true); return true; +// case R.id.menu_call_insecure: handleDial(getRecipient(), false); return true; case R.id.menu_unblock: handleUnblock(); return true; case R.id.menu_block: handleBlock(); return true; case R.id.menu_view_media: handleViewMedia(); return true; case R.id.menu_add_shortcut: handleAddShortcut(); return true; case R.id.menu_search: handleSearch(); return true; - case R.id.menu_add_to_contacts: handleAddToContacts(); return true; +// case R.id.menu_add_to_contacts: handleAddToContacts(); return true; case R.id.menu_reset_secure_session: handleResetSecureSession(); return true; - case R.id.menu_group_recipients: handleDisplayGroupRecipients(); return true; +// case R.id.menu_group_recipients: handleDisplayGroupRecipients(); return true; case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true; case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item); return true; case R.id.menu_edit_group: handleEditPushGroup(); return true;