diff options
author | Sarmad Hashmi <mhashmi@google.com> | 2016-02-25 22:52:50 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-02-25 22:52:50 +0000 |
commit | 97fd05bd58da1c5c1f0d65cd166ae27089fdced8 (patch) | |
tree | 7786f8e7cfa8bbf80ceb940b4fc3a1c13292affc | |
parent | 98d643b6f2247942b5b7dabbe0e18d8afdae2a0b (diff) | |
parent | ef57777a221ea78511e28e5f17c69da96c8a629c (diff) |
Add resource files for voicemail archive.
am: ef57777a22
* commit 'ef57777a221ea78511e28e5f17c69da96c8a629c':
Add resource files for voicemail archive.
-rw-r--r-- | res/drawable-hdpi/ic_archive_white_24dp.png | bin | 0 -> 247 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_archive_white_24dp.png | bin | 0 -> 181 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_archive_white_24dp.png | bin | 0 -> 267 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_archive_white_24dp.png | bin | 0 -> 390 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ic_archive_white_24dp.png | bin | 0 -> 489 bytes | |||
-rw-r--r-- | res/layout/voicemail_playback_layout.xml | 11 | ||||
-rw-r--r-- | res/menu/dialtacts_options.xml | 3 | ||||
-rw-r--r-- | res/values/strings.xml | 21 |
8 files changed, 35 insertions, 0 deletions
diff --git a/res/drawable-hdpi/ic_archive_white_24dp.png b/res/drawable-hdpi/ic_archive_white_24dp.png Binary files differnew file mode 100644 index 000000000..bb72e890f --- /dev/null +++ b/res/drawable-hdpi/ic_archive_white_24dp.png diff --git a/res/drawable-mdpi/ic_archive_white_24dp.png b/res/drawable-mdpi/ic_archive_white_24dp.png Binary files differnew file mode 100644 index 000000000..f6aa3f966 --- /dev/null +++ b/res/drawable-mdpi/ic_archive_white_24dp.png diff --git a/res/drawable-xhdpi/ic_archive_white_24dp.png b/res/drawable-xhdpi/ic_archive_white_24dp.png Binary files differnew file mode 100644 index 000000000..3513bd9fe --- /dev/null +++ b/res/drawable-xhdpi/ic_archive_white_24dp.png diff --git a/res/drawable-xxhdpi/ic_archive_white_24dp.png b/res/drawable-xxhdpi/ic_archive_white_24dp.png Binary files differnew file mode 100644 index 000000000..00e04e42b --- /dev/null +++ b/res/drawable-xxhdpi/ic_archive_white_24dp.png diff --git a/res/drawable-xxxhdpi/ic_archive_white_24dp.png b/res/drawable-xxxhdpi/ic_archive_white_24dp.png Binary files differnew file mode 100644 index 000000000..34cd3fd80 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_archive_white_24dp.png diff --git a/res/layout/voicemail_playback_layout.xml b/res/layout/voicemail_playback_layout.xml index bb7fe342a..64a68bdd2 100644 --- a/res/layout/voicemail_playback_layout.xml +++ b/res/layout/voicemail_playback_layout.xml @@ -97,6 +97,17 @@ android:tint="@color/voicemail_icon_tint" android:contentDescription="@string/call_log_trash_voicemail" /> + <Space + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_weight="1" /> + + <ImageButton android:id="@+id/archive_voicemail" + style="@style/VoicemailPlaybackLayoutButtonStyle" + android:src="@drawable/ic_archive_white_24dp" + android:tint="@color/voicemail_icon_tint" + android:contentDescription="@string/call_log_archive_voicemail" /> + </LinearLayout> </LinearLayout> diff --git a/res/menu/dialtacts_options.xml b/res/menu/dialtacts_options.xml index 8a9e25f7f..8e31026a7 100644 --- a/res/menu/dialtacts_options.xml +++ b/res/menu/dialtacts_options.xml @@ -20,6 +20,9 @@ android:icon="@drawable/ic_menu_history_lt" android:title="@string/action_menu_call_history_description" /> <item + android:id="@+id/menu_archive" + android:title="@string/voicemail_archive_activity_title" /> + <item android:id="@+id/menu_import_export" android:title="@string/menu_import_export" /> <item diff --git a/res/values/strings.xml b/res/values/strings.xml index 34fd2e5ce..734dde899 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -84,12 +84,21 @@ <!-- Menu item used to delete a voicemail. [CHAR LIMIT=30] --> <string name="call_log_trash_voicemail">Delete voicemail</string> + <!-- Menu item used to archive a voicemail. [CHAR LIMIT=30] --> + <string name="call_log_archive_voicemail">Archive voicemail</string> + <!-- Text for snackbar to undo a voicemail delete. [CHAR LIMIT=30] --> <string name="snackbar_voicemail_deleted">Voicemail deleted</string> + <!-- Text for snackbar to undo a voicemail archive. [CHAR LIMIT=30] --> + <string name="snackbar_voicemail_archived">Voicemail archived</string> + <!-- Text for undo button in snackbar for voicemail deletion. [CHAR LIMIT=10] --> <string name="snackbar_voicemail_deleted_undo">UNDO</string> + <!-- Text for going to archive button in snackbar for voicemail archive. [CHAR LIMIT=10] --> + <string name="snackbar_voicemail_archived_goto">GOTO ARCHIVE</string> + <!-- Title of the confirmation dialog for clearing the call log. [CHAR LIMIT=37] --> <string name="clearCallLogConfirmation_title">Clear call history?</string> @@ -158,6 +167,9 @@ <!-- Message to display whilst we are waiting for the content to be fetched. [CHAR LIMIT=40] --> <string name="voicemail_fetching_content">Loading voicemail\u2026</string> + <!-- Message to display whilst we are waiting for the content to be archived. [CHAR LIMIT=40] --> + <string name="voicemail_archiving_content">Archiving voicemail\u2026</string> + <!-- Message to display if we fail to get content within a suitable time period. [CHAR LIMIT=40] --> <string name="voicemail_fetching_timout">Couldn\'t load voicemail</string> @@ -531,12 +543,18 @@ <!-- Text displayed when the list of voicemails is empty --> <string name="call_log_voicemail_empty">Your voicemail inbox is empty.</string> + <!-- Text displayed when the list of voicemail archives is empty --> + <string name="voicemail_archive_empty">Your voicemail archive is empty.</string> + <!-- Menu option to show favorite contacts only --> <string name="show_favorites_only">Show favorites only</string> <!-- Title of activity that displays a list of all calls --> <string name="call_log_activity_title">Call History</string> + <!-- Title of activity that displays a list of all archived voicemails --> + <string name="voicemail_archive_activity_title">Voicemail Archive</string> + <!-- Title for the call log tab containing the list of all voicemails and calls [CHAR LIMIT=30] --> <string name="call_log_all_title">All</string> @@ -917,6 +935,9 @@ <!-- Error toast message for when send to voicemail import fails. [CHAR LIMIT=40] --> <string name="send_to_voicemail_import_failed">Import failed</string> + <!-- Error toast message for when voicemail archive fails. [CHAR LIMIT=40] --> + <string name="voicemail_archive_failed">Failed to archive voicemail.</string> + <!-- String describing the delete icon on a blocked number list item. When tapped, it will show a dialog confirming the unblocking of the number. [CHAR LIMIT=NONE]--> |