am 2cb42e06: am c8858035: am a8b41166: am ae020de6: am 3b754eb4: Merge "Revert "Force Show Vector Drawables (UnifiedEmail)"" into ub-gmail-ur14-dev
* commit '2cb42e06c5810bf8885289b2fcb6801ac72d1cff':
Revert "Force Show Vector Drawables (UnifiedEmail)"
diff --git a/res/drawable-hdpi/ic_folder_parent_24dp.png b/res/drawable-hdpi/ic_folder_parent_24dp.png
index 3a5ced8..5b70960 100644
--- a/res/drawable-hdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-hdpi/ic_folder_parent_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_notification_mail_wht_24dp.png b/res/drawable-hdpi/ic_notification_mail_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_notification_mail_wht_24dp.png
rename to res/drawable-hdpi/ic_notification_mail_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_notification_multiple_mail_wht_24dp.png b/res/drawable-hdpi/ic_notification_multiple_mail_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_notification_multiple_mail_wht_24dp.png
rename to res/drawable-hdpi/ic_notification_multiple_mail_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_parent_24dp.png b/res/drawable-mdpi/ic_folder_parent_24dp.png
index 732cb77..87bd547 100644
--- a/res/drawable-mdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-mdpi/ic_folder_parent_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_notification_mail_wht_24dp.png b/res/drawable-mdpi/ic_notification_mail_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_notification_mail_wht_24dp.png
rename to res/drawable-mdpi/ic_notification_mail_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_notification_multiple_mail_wht_24dp.png b/res/drawable-mdpi/ic_notification_multiple_mail_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_notification_multiple_mail_wht_24dp.png
rename to res/drawable-mdpi/ic_notification_multiple_mail_24dp.png
Binary files differ
diff --git a/res/drawable-anydpi-v21/ic_archive_wht_24dp.xml b/res/drawable-v21/ic_archive_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_archive_wht_24dp.xml
rename to res/drawable-v21/ic_archive_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_arrow_back_24dp.xml b/res/drawable-v21/ic_arrow_back_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_arrow_back_24dp.xml
rename to res/drawable-v21/ic_arrow_back_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_arrow_back_wht_24dp.xml b/res/drawable-v21/ic_arrow_back_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_arrow_back_wht_24dp.xml
rename to res/drawable-v21/ic_arrow_back_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_attach_file_wht_24dp.xml b/res/drawable-v21/ic_attach_file_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_attach_file_wht_24dp.xml
rename to res/drawable-v21/ic_attach_file_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_cancel_24dp.xml b/res/drawable-v21/ic_cancel_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_cancel_24dp.xml
rename to res/drawable-v21/ic_cancel_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_cancel_wht_24dp.xml b/res/drawable-v21/ic_cancel_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_cancel_wht_24dp.xml
rename to res/drawable-v21/ic_cancel_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_check_24dp.xml b/res/drawable-v21/ic_check_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_check_24dp.xml
rename to res/drawable-v21/ic_check_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml b/res/drawable-v21/ic_check_wht_24dp.xml
similarity index 78%
rename from res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
rename to res/drawable-v21/ic_check_wht_24dp.xml
index 1129c07..fa02710 100644
--- a/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
+++ b/res/drawable-v21/ic_check_wht_24dp.xml
@@ -19,6 +19,9 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
+ android:pathData="M0 0h24v24h-24z"
+ android:fillColor="#00000000"/>
+ <path
android:fillColor="#ffffffff"
- android:pathData="M22.0,8.0c0.0,-0.7 -0.4,-1.3 -0.9,-1.7L12.0,1.0L2.9,6.3C2.4,6.7 2.0,7.3 2.0,8.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l16.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L22.0,8.0zM12.0,13.0L3.7,7.8L12.0,3.0l8.3,4.8L12.0,13.0z"/>
+ android:pathData="M9.0,16.17l-4.17,-4.17 -1.42,1.41 5.59,5.59 12.0,-12.0 -1.41,-1.41z"/>
</vector>
diff --git a/res/drawable-anydpi-v21/ic_close_24dp.xml b/res/drawable-v21/ic_close_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_close_24dp.xml
rename to res/drawable-v21/ic_close_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_close_wht_24dp.xml b/res/drawable-v21/ic_close_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_close_wht_24dp.xml
rename to res/drawable-v21/ic_close_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_cv_loading_24dp.xml b/res/drawable-v21/ic_cv_loading_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_cv_loading_24dp.xml
rename to res/drawable-v21/ic_cv_loading_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_delete_wht_24dp.xml b/res/drawable-v21/ic_delete_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_delete_wht_24dp.xml
rename to res/drawable-v21/ic_delete_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_accnt_check_24dp.xml b/res/drawable-v21/ic_drawer_accnt_check_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_accnt_check_24dp.xml
rename to res/drawable-v21/ic_drawer_accnt_check_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_drafts_24dp.xml b/res/drawable-v21/ic_drawer_drafts_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_drafts_24dp.xml
rename to res/drawable-v21/ic_drawer_drafts_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_folder_24dp.xml b/res/drawable-v21/ic_drawer_folder_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_folder_24dp.xml
rename to res/drawable-v21/ic_drawer_folder_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_help_24dp.xml b/res/drawable-v21/ic_drawer_help_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_help_24dp.xml
rename to res/drawable-v21/ic_drawer_help_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_inbox_24dp.xml b/res/drawable-v21/ic_drawer_inbox_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_inbox_24dp.xml
rename to res/drawable-v21/ic_drawer_inbox_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_outbox_24dp.xml b/res/drawable-v21/ic_drawer_outbox_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_outbox_24dp.xml
rename to res/drawable-v21/ic_drawer_outbox_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_sent_24dp.xml b/res/drawable-v21/ic_drawer_sent_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_sent_24dp.xml
rename to res/drawable-v21/ic_drawer_sent_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_settings_24dp.xml b/res/drawable-v21/ic_drawer_settings_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_settings_24dp.xml
rename to res/drawable-v21/ic_drawer_settings_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_starred_24dp.xml b/res/drawable-v21/ic_drawer_starred_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_starred_24dp.xml
rename to res/drawable-v21/ic_drawer_starred_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_trash_24dp.xml b/res/drawable-v21/ic_drawer_trash_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_trash_24dp.xml
rename to res/drawable-v21/ic_drawer_trash_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_unread_24dp.xml b/res/drawable-v21/ic_drawer_unread_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drawer_unread_24dp.xml
rename to res/drawable-v21/ic_drawer_unread_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drop_down_24dp.xml b/res/drawable-v21/ic_drop_down_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drop_down_24dp.xml
rename to res/drawable-v21/ic_drop_down_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drop_up_24dp.xml b/res/drawable-v21/ic_drop_up_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_drop_up_24dp.xml
rename to res/drawable-v21/ic_drop_up_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_empty_default.xml b/res/drawable-v21/ic_empty_default.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_empty_default.xml
rename to res/drawable-v21/ic_empty_default.xml
diff --git a/res/drawable-anydpi-v21/ic_empty_inbox.xml b/res/drawable-v21/ic_empty_inbox.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_empty_inbox.xml
rename to res/drawable-v21/ic_empty_inbox.xml
diff --git a/res/drawable-anydpi-v21/ic_empty_search.xml b/res/drawable-v21/ic_empty_search.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_empty_search.xml
rename to res/drawable-v21/ic_empty_search.xml
diff --git a/res/drawable-anydpi-v21/ic_empty_spam.xml b/res/drawable-v21/ic_empty_spam.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_empty_spam.xml
rename to res/drawable-v21/ic_empty_spam.xml
diff --git a/res/drawable-anydpi-v21/ic_empty_trash.xml b/res/drawable-v21/ic_empty_trash.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_empty_trash.xml
rename to res/drawable-v21/ic_empty_trash.xml
diff --git a/res/drawable-anydpi-v21/ic_expand_more_24dp.xml b/res/drawable-v21/ic_expand_more_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_expand_more_24dp.xml
rename to res/drawable-v21/ic_expand_more_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_folder_parent_24dp.xml b/res/drawable-v21/ic_folder_parent_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_folder_parent_24dp.xml
rename to res/drawable-v21/ic_folder_parent_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_forward_24dp.xml b/res/drawable-v21/ic_forward_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_forward_24dp.xml
rename to res/drawable-v21/ic_forward_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_history_24dp.xml b/res/drawable-v21/ic_history_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_history_24dp.xml
rename to res/drawable-v21/ic_history_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_mark_read_wht_24dp.xml b/res/drawable-v21/ic_mark_read_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_mark_read_wht_24dp.xml
rename to res/drawable-v21/ic_mark_read_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_drawer_unread_24dp.xml b/res/drawable-v21/ic_mark_unread_wht_24dp.xml
similarity index 100%
copy from res/drawable-anydpi-v21/ic_drawer_unread_24dp.xml
copy to res/drawable-v21/ic_mark_unread_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_menu_search.xml b/res/drawable-v21/ic_menu_search.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_menu_search.xml
rename to res/drawable-v21/ic_menu_search.xml
diff --git a/res/drawable-anydpi-v21/ic_menu_wht_24dp.xml b/res/drawable-v21/ic_menu_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_menu_wht_24dp.xml
rename to res/drawable-v21/ic_menu_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_mic_24dp.xml b/res/drawable-v21/ic_mic_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_mic_24dp.xml
rename to res/drawable-v21/ic_mic_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_mic_wht_24dp.xml b/res/drawable-v21/ic_mic_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_mic_wht_24dp.xml
rename to res/drawable-v21/ic_mic_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_move_to_inbox_wht_24dp.xml b/res/drawable-v21/ic_move_to_inbox_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_move_to_inbox_wht_24dp.xml
rename to res/drawable-v21/ic_move_to_inbox_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_move_to_wht_24dp.xml b/res/drawable-v21/ic_move_to_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_move_to_wht_24dp.xml
rename to res/drawable-v21/ic_move_to_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_next_24dp.xml b/res/drawable-v21/ic_next_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_next_24dp.xml
rename to res/drawable-v21/ic_next_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_notification_anonymous_avatar_32dp.xml b/res/drawable-v21/ic_notification_anonymous_avatar_32dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_notification_anonymous_avatar_32dp.xml
rename to res/drawable-v21/ic_notification_anonymous_avatar_32dp.xml
diff --git a/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml b/res/drawable-v21/ic_notification_mail_24dp.xml
similarity index 74%
copy from res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
copy to res/drawable-v21/ic_notification_mail_24dp.xml
index 1129c07..7fdf07e 100644
--- a/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
+++ b/res/drawable-v21/ic_notification_mail_24dp.xml
@@ -20,5 +20,5 @@
android:viewportHeight="24.0">
<path
android:fillColor="#ffffffff"
- android:pathData="M22.0,8.0c0.0,-0.7 -0.4,-1.3 -0.9,-1.7L12.0,1.0L2.9,6.3C2.4,6.7 2.0,7.3 2.0,8.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l16.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L22.0,8.0zM12.0,13.0L3.7,7.8L12.0,3.0l8.3,4.8L12.0,13.0z"/>
+ android:pathData="M20.0,4.0L4.0,4.0C2.9,4.0 2.0,4.9 2.0,6.0l0.0,12.0c0.0,1.1 0.9,2.0 2.0,2.0l16.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L22.0,6.0C22.0,4.9 21.1,4.0 20.0,4.0zM20.0,18.0l-2.0,0.0L18.0,9.2L12.0,13.0L6.0,9.2L6.0,18.0L4.0,18.0L4.0,6.0l1.2,0.0l6.8,4.2L18.8,6.0L20.0,6.0L20.0,18.0z"/>
</vector>
diff --git a/res/drawable-v21/ic_notification_multiple_mail_24dp.xml b/res/drawable-v21/ic_notification_multiple_mail_24dp.xml
new file mode 100644
index 0000000..2c24e3f
--- /dev/null
+++ b/res/drawable-v21/ic_notification_multiple_mail_24dp.xml
@@ -0,0 +1,27 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#8a000000"
+ android:pathData="M2.0,6.033888L2.0,18.0C2.0,19.104 2.896,20.0 4.0,20.0L20.978577,20.0L20.978577,18.0L4.0,18.0L4.0,6.033888L2.0,6.033888Z"/>
+ <path
+ android:fillColor="#8a000000"
+ android:pathData="M20.3,3.0L6.7,3.0C5.761175,3.0 5.008925,3.7835624 5.008925,4.75L5.0,15.25C5.0,16.216438 5.761175,17.0 6.7,17.0L20.3,17.0C21.238825,17.0 22.0,16.216438 22.0,15.25L22.0,4.75C22.0,3.7835624 21.238825,3.0 20.3,3.0L20.3,3.0ZM18.5,15.0L18.5,6.9974947L13.5,10.5L8.5,6.9974947L8.5,15.0L7.0,15.0L7.0,5.0L8.5,5.0L13.5,8.5L18.5,5.0L20.0,5.0L20.0,15.0L18.5,15.0Z"/>
+</vector>
diff --git a/res/drawable-anydpi-v21/ic_overflow_24dp.xml b/res/drawable-v21/ic_overflow_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_overflow_24dp.xml
rename to res/drawable-v21/ic_overflow_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_pencil_24dp.xml b/res/drawable-v21/ic_pencil_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_pencil_24dp.xml
rename to res/drawable-v21/ic_pencil_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_pencil_wht_24dp.xml b/res/drawable-v21/ic_pencil_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_pencil_wht_24dp.xml
rename to res/drawable-v21/ic_pencil_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_remove_label_wht_24dp.xml b/res/drawable-v21/ic_remove_label_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_remove_label_wht_24dp.xml
rename to res/drawable-v21/ic_remove_label_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_reply_24dp.xml b/res/drawable-v21/ic_reply_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_reply_24dp.xml
rename to res/drawable-v21/ic_reply_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_reply_all_24dp.xml b/res/drawable-v21/ic_reply_all_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_reply_all_24dp.xml
rename to res/drawable-v21/ic_reply_all_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_reply_all_wht_24dp.xml b/res/drawable-v21/ic_reply_all_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_reply_all_wht_24dp.xml
rename to res/drawable-v21/ic_reply_all_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_reply_wht_24dp.xml b/res/drawable-v21/ic_reply_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_reply_wht_24dp.xml
rename to res/drawable-v21/ic_reply_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_send_wht_24dp.xml b/res/drawable-v21/ic_send_wht_24dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_send_wht_24dp.xml
rename to res/drawable-v21/ic_send_wht_24dp.xml
diff --git a/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml b/res/drawable-v21/ic_star_20dp.xml
similarity index 62%
copy from res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
copy to res/drawable-v21/ic_star_20dp.xml
index 1129c07..b2cc432 100644
--- a/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
+++ b/res/drawable-v21/ic_star_20dp.xml
@@ -14,11 +14,11 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:width="20.0dp"
+ android:height="20.0dp"
+ android:viewportWidth="20.0"
+ android:viewportHeight="20.0">
<path
- android:fillColor="#ffffffff"
- android:pathData="M22.0,8.0c0.0,-0.7 -0.4,-1.3 -0.9,-1.7L12.0,1.0L2.9,6.3C2.4,6.7 2.0,7.3 2.0,8.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l16.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L22.0,8.0zM12.0,13.0L3.7,7.8L12.0,3.0l8.3,4.8L12.0,13.0z"/>
+ android:fillColor="#ffFEB500"
+ android:pathData="M10.0,0.0L7.192,6.9757895L0.0,7.625263L5.455,12.601052L3.82,20.0L10.0,16.07579L16.18,20.0L14.545,12.601052L20.0,7.625263L12.809,6.9757895L10.0,0.0"/>
</vector>
diff --git a/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml b/res/drawable-v21/ic_star_outline_20dp.xml
similarity index 62%
copy from res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
copy to res/drawable-v21/ic_star_outline_20dp.xml
index 1129c07..454d037 100644
--- a/res/drawable-anydpi-v21/ic_mark_unread_wht_24dp.xml
+++ b/res/drawable-v21/ic_star_outline_20dp.xml
@@ -14,11 +14,11 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:width="20.0dp"
+ android:height="20.0dp"
+ android:viewportWidth="20.0"
+ android:viewportHeight="20.0">
<path
- android:fillColor="#ffffffff"
- android:pathData="M22.0,8.0c0.0,-0.7 -0.4,-1.3 -0.9,-1.7L12.0,1.0L2.9,6.3C2.4,6.7 2.0,7.3 2.0,8.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l16.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L22.0,8.0zM12.0,13.0L3.7,7.8L12.0,3.0l8.3,4.8L12.0,13.0z"/>
+ android:fillColor="#33000000"
+ android:pathData="M10.0,0.0L7.192,6.9757895L0.0,7.625263L5.455,12.601052L3.82,20.0L10.0,16.07579L16.18,20.0L14.545,12.601052L20.0,7.625263L12.809,6.9757895L10.0,0.0"/>
</vector>
diff --git a/res/drawable-anydpi-v21/ic_warning_56dp.xml b/res/drawable-v21/ic_warning_56dp.xml
similarity index 100%
rename from res/drawable-anydpi-v21/ic_warning_56dp.xml
rename to res/drawable-v21/ic_warning_56dp.xml
diff --git a/res/drawable-xhdpi/ic_folder_parent_24dp.png b/res/drawable-xhdpi/ic_folder_parent_24dp.png
index 29a83d3..a4133b1 100644
--- a/res/drawable-xhdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-xhdpi/ic_folder_parent_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_notification_mail_wht_24dp.png b/res/drawable-xhdpi/ic_notification_mail_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_notification_mail_wht_24dp.png
rename to res/drawable-xhdpi/ic_notification_mail_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_notification_multiple_mail_wht_24dp.png b/res/drawable-xhdpi/ic_notification_multiple_mail_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_notification_multiple_mail_wht_24dp.png
rename to res/drawable-xhdpi/ic_notification_multiple_mail_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_parent_24dp.png b/res/drawable-xxhdpi/ic_folder_parent_24dp.png
index c94acd2..19f2e4b 100644
--- a/res/drawable-xxhdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-xxhdpi/ic_folder_parent_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_notification_mail_wht_24dp.png b/res/drawable-xxhdpi/ic_notification_mail_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_notification_mail_wht_24dp.png
rename to res/drawable-xxhdpi/ic_notification_mail_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_notification_multiple_mail_wht_24dp.png b/res/drawable-xxhdpi/ic_notification_multiple_mail_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_notification_multiple_mail_wht_24dp.png
rename to res/drawable-xxhdpi/ic_notification_multiple_mail_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_attach_file_wht_24dp.png b/res/drawable-xxxhdpi/ic_attach_file_wht_24dp.png
new file mode 100644
index 0000000..7ac13a1
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_attach_file_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_cancel_24dp.png b/res/drawable-xxxhdpi/ic_cancel_24dp.png
new file mode 100644
index 0000000..1e3c5c1
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_cancel_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_check_24dp.png b/res/drawable-xxxhdpi/ic_check_24dp.png
new file mode 100644
index 0000000..73c945a
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_check_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_close_24dp.png b/res/drawable-xxxhdpi/ic_close_24dp.png
new file mode 100644
index 0000000..cb7a27c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_close_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_close_wht_24dp.png b/res/drawable-xxxhdpi/ic_close_wht_24dp.png
new file mode 100644
index 0000000..81f51a3
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_close_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_cv_loading_24dp.png b/res/drawable-xxxhdpi/ic_cv_loading_24dp.png
new file mode 100644
index 0000000..5349075
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_cv_loading_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_accnt_check_24dp.png b/res/drawable-xxxhdpi/ic_drawer_accnt_check_24dp.png
new file mode 100644
index 0000000..9619115
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_accnt_check_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png b/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png
new file mode 100644
index 0000000..a2a58be
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png b/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png
new file mode 100644
index 0000000..1bd3626
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_help_24dp.png b/res/drawable-xxxhdpi/ic_drawer_help_24dp.png
new file mode 100644
index 0000000..667aea8
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_help_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png b/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png
new file mode 100644
index 0000000..1797751
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png b/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png
new file mode 100644
index 0000000..7d1ad29
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png b/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png
new file mode 100644
index 0000000..23e475e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png b/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png
new file mode 100644
index 0000000..83b92c4
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png b/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png
new file mode 100644
index 0000000..d1b77ca
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png b/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png
new file mode 100644
index 0000000..3bf1f7e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png b/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png
new file mode 100644
index 0000000..a36596d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drop_down_24dp.png b/res/drawable-xxxhdpi/ic_drop_down_24dp.png
new file mode 100644
index 0000000..8f918b2
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drop_down_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_drop_up_24dp.png b/res/drawable-xxxhdpi/ic_drop_up_24dp.png
new file mode 100644
index 0000000..3d0e5cc
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_drop_up_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_expand_more_24dp.png b/res/drawable-xxxhdpi/ic_expand_more_24dp.png
new file mode 100644
index 0000000..d5a4eef
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_expand_more_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_folder_parent_24dp.png b/res/drawable-xxxhdpi/ic_folder_parent_24dp.png
new file mode 100644
index 0000000..d218c6c
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_folder_parent_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_mark_read_wht_24dp.png b/res/drawable-xxxhdpi/ic_mark_read_wht_24dp.png
new file mode 100644
index 0000000..fc9c3e5
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_mark_read_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_mark_unread_wht_24dp.png b/res/drawable-xxxhdpi/ic_mark_unread_wht_24dp.png
new file mode 100644
index 0000000..50c1d69
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_mark_unread_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_menu_search.png b/res/drawable-xxxhdpi/ic_menu_search.png
new file mode 100644
index 0000000..9b6da57
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_menu_search.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_menu_wht_24dp.png b/res/drawable-xxxhdpi/ic_menu_wht_24dp.png
new file mode 100644
index 0000000..fa8e6de
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_menu_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_mic_24dp.png b/res/drawable-xxxhdpi/ic_mic_24dp.png
new file mode 100644
index 0000000..c586bb5
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_mic_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_mic_wht_24dp.png b/res/drawable-xxxhdpi/ic_mic_wht_24dp.png
new file mode 100644
index 0000000..fe00ae5
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_mic_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_next_24dp.png b/res/drawable-xxxhdpi/ic_next_24dp.png
new file mode 100644
index 0000000..4e7264d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_next_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_pencil_wht_24dp.png b/res/drawable-xxxhdpi/ic_pencil_wht_24dp.png
new file mode 100644
index 0000000..6f06223
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_pencil_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_send_wht_24dp.png b/res/drawable-xxxhdpi/ic_send_wht_24dp.png
new file mode 100644
index 0000000..f872669
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_send_wht_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_warning_56dp.png b/res/drawable-xxxhdpi/ic_warning_56dp.png
new file mode 100644
index 0000000..65bc0fb
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_warning_56dp.png
Binary files differ
diff --git a/src/com/android/mail/utils/NotificationActionUtils.java b/src/com/android/mail/utils/NotificationActionUtils.java
index 6620a13..496a7de 100644
--- a/src/com/android/mail/utils/NotificationActionUtils.java
+++ b/src/com/android/mail/utils/NotificationActionUtils.java
@@ -633,7 +633,7 @@
final NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
- builder.setSmallIcon(R.drawable.ic_notification_mail_wht_24dp);
+ builder.setSmallIcon(R.drawable.ic_notification_mail_24dp);
builder.setWhen(notificationAction.getWhen());
builder.setCategory(NotificationCompat.CATEGORY_EMAIL);
diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index 98f334c..f850a67 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java
@@ -630,9 +630,9 @@
}
if(unseenCount > 1) {
- notification.setSmallIcon(R.drawable.ic_notification_multiple_mail_wht_24dp);
+ notification.setSmallIcon(R.drawable.ic_notification_multiple_mail_24dp);
} else {
- notification.setSmallIcon(R.drawable.ic_notification_mail_wht_24dp);
+ notification.setSmallIcon(R.drawable.ic_notification_mail_24dp);
}
notification.setTicker(account.getDisplayName());
notification.setVisibility(NotificationCompat.VISIBILITY_PRIVATE);
@@ -868,9 +868,9 @@
if (multipleUnseen) {
builder.setGroup(createGroupKey(account, folder));
builder.setGroupSummary(true);
- builder.setSmallIcon(R.drawable.ic_notification_multiple_mail_wht_24dp);
+ builder.setSmallIcon(R.drawable.ic_notification_multiple_mail_24dp);
} else {
- builder.setSmallIcon(R.drawable.ic_notification_mail_wht_24dp);
+ builder.setSmallIcon(R.drawable.ic_notification_mail_24dp);
}
return builder.build();
@@ -1073,7 +1073,7 @@
conversationNotif.setCategory(NotificationCompat.CATEGORY_EMAIL);
conversationNotif.setSmallIcon(
- R.drawable.ic_notification_multiple_mail_wht_24dp);
+ R.drawable.ic_notification_multiple_mail_24dp);
if (com.android.mail.utils.Utils.isRunningLOrLater()) {
conversationNotif.setColor(
