Migrated all old conversation options from menu to toolbar

This commit is contained in:
Moez Bhatti
2015-10-31 11:39:40 -04:00
parent 9ae752322e
commit c8890fff90
12 changed files with 161 additions and 181 deletions

Before

Width:  |  Height:  |  Size: 516 B

After

Width:  |  Height:  |  Size: 516 B

+9
View File
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M20,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2zm0,4l-8,5 -8,-5V6l8,5 8,-5v2z" />
</vector>
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M21.99,8c0,-0.72 -0.37,-1.35 -0.94,-1.7L12,1 2.95,6.3C2.38,6.65 2,7.28 2,8v10c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2l-0.01,-10zM12,13L3.74,7.84 12,3l8.26,4.84L12,13z" />
</vector>
@@ -51,7 +51,7 @@
android:layout_height="16dp"
android:alpha="1.0"
android:padding="4dp"
android:src="@drawable/ic_unread" />
android:src="@drawable/ic_unread_indicator" />
<ImageView
android:id="@+id/welcome_indicator_1"
@@ -59,7 +59,7 @@
android:layout_height="16dp"
android:alpha="0.6"
android:padding="4dp"
android:src="@drawable/ic_unread" />
android:src="@drawable/ic_unread_indicator" />
<ImageView
android:id="@+id/welcome_indicator_2"
@@ -67,7 +67,7 @@
android:layout_height="16dp"
android:alpha="0.6"
android:padding="4dp"
android:src="@drawable/ic_unread" />
android:src="@drawable/ic_unread_indicator" />
<ImageView
android:id="@+id/welcome_next"
@@ -82,7 +82,7 @@
android:id="@+id/unread"
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/ic_unread"
android:src="@drawable/ic_unread_indicator"
android:visibility="gone" />
</LinearLayout>
@@ -14,4 +14,24 @@
android:title="@string/menu_mark_read"
android:visible="true"
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_block"
android:title="@string/menu_block_conversation" />
<item
android:id="@+id/menu_delete_failed"
android:title="@string/menu_delete_failed" />
<item
android:id="@+id/menu_select_all"
android:title="@string/menu_select_all" />
<item
android:id="@+id/menu_deselect_all"
android:title="@string/menu_deselect_all" />
<item
android:id="@+id/menu_done"
android:title="@string/menu_done" />
</menu>
+6 -7
View File
@@ -417,14 +417,10 @@
<!-- Word represents 'self' in a conversation -->
<string name="me">Me</string>
<!-- Menu title for editing a message -->
<string name="menu_edit">Edit</string>
<!-- Menu title for deleting undelivered messages or messages on
the SIM card. -->
<string name="menu_delete_messages">Delete messages</string>
<!-- Menu title for locking a message -->
<string name="menu_delete_failed">Delete failed messages</string>
<string name="menu_lock">Lock</string>
<!-- Menu title for unlocking a message -->
<string name="menu_unlock">Unlock</string>
<!-- When the user tries to view message details and some error occurs while
@@ -645,8 +641,8 @@
<string name="menu_mute_conversation">Mute conversation</string>
<!--Menu option to mute conversation-->
<string name="menu_unmute_conversation">Unmute conversation</string>
<string name="menu_block_conversation">Block conversation</string>
<string name="menu_unblock_conversation">Unblock conversation</string>
<string name="menu_block_conversations">Block conversations</string>
<string name="menu_unblock_conversations">Unblock conversations</string>
<string name="menu_messages">Messages</string>
<string name="menu_blocked">Blocked</string>
<string name="menu_blocked_conversations">Blocked (%s new)</string>
@@ -659,6 +655,9 @@
<string name="menu_mark_unread">Mark unread</string>
<string name="menu_delete_conversation">Delete conversation</string>
<string name="menu_multi_select">Select conversation</string>
<string name="menu_select_all">Select all</string>
<string name="menu_deselect_all">Deselect all</string>
<string name="menu_done">Done</string>
<string name="failed_message_title">Failed message options</string>
<!--Toast shown to tell the user that they don't have a photo attachments app, and suggests that they download one-->
<string name="attachment_app_not_found">Attachments app not found. Try installing a photo gallery app!</string>