Merge "Temporarily update mark read & mark unread icons" into ub-gmail-ur14-dev

22 files changed, 5 insertions, 5 deletions

diff --git a/res/drawable-hdpi/ic_markunread_wht_24dp.png b/res/drawable-hdpi/ic_markunread_wht_24dp.png
deleted file mode 100644
index f137fae3f..000000000
--- a/res/drawable-hdpi/ic_markunread_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_menu_mark_read_holo_light.png b/res/drawable-hdpi/ic_menu_mark_read_holo_light.png
deleted file mode 100644
index ab88cfbd4..000000000
--- a/res/drawable-hdpi/ic_menu_mark_read_holo_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_menu_mark_read_wht_24dp.png b/res/drawable-hdpi/ic_menu_mark_read_wht_24dp.png
new file mode 100644
index 000000000..2d27488a4
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_mark_read_wht_24dp.png
diff --git a/res/drawable-hdpi/ic_menu_mark_unread_wht_24dp.png b/res/drawable-hdpi/ic_menu_mark_unread_wht_24dp.png
new file mode 100644
index 000000000..ab157b5b5
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_mark_unread_wht_24dp.png
diff --git a/res/drawable-mdpi/ic_markunread_wht_24dp.png b/res/drawable-mdpi/ic_markunread_wht_24dp.png
deleted file mode 100644
index ad1e906fa..000000000
--- a/res/drawable-mdpi/ic_markunread_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_menu_mark_read_holo_light.png b/res/drawable-mdpi/ic_menu_mark_read_holo_light.png
deleted file mode 100644
index 398388e1f..000000000
--- a/res/drawable-mdpi/ic_menu_mark_read_holo_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_menu_mark_read_wht_24dp.png b/res/drawable-mdpi/ic_menu_mark_read_wht_24dp.png
new file mode 100644
index 000000000..4d54b082f
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_mark_read_wht_24dp.png
diff --git a/res/drawable-mdpi/ic_menu_mark_unread_wht_24dp.png b/res/drawable-mdpi/ic_menu_mark_unread_wht_24dp.png
new file mode 100644
index 000000000..dd1d13407
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_mark_unread_wht_24dp.png
diff --git a/res/drawable-xhdpi/ic_markunread_wht_24dp.png b/res/drawable-xhdpi/ic_markunread_wht_24dp.png
deleted file mode 100644
index 609989402..000000000
--- a/res/drawable-xhdpi/ic_markunread_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_menu_mark_read_holo_light.png b/res/drawable-xhdpi/ic_menu_mark_read_holo_light.png
deleted file mode 100644
index 5845a710d..000000000
--- a/res/drawable-xhdpi/ic_menu_mark_read_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_menu_mark_read_wht_24dp.png b/res/drawable-xhdpi/ic_menu_mark_read_wht_24dp.png
new file mode 100644
index 000000000..a06fc2dfa
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_mark_read_wht_24dp.png
diff --git a/res/drawable-xhdpi/ic_menu_mark_unread_wht_24dp.png b/res/drawable-xhdpi/ic_menu_mark_unread_wht_24dp.png
new file mode 100644
index 000000000..1b2b89565
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_mark_unread_wht_24dp.png
diff --git a/res/drawable-xxhdpi/ic_markunread_wht_24dp.png b/res/drawable-xxhdpi/ic_markunread_wht_24dp.png
deleted file mode 100644
index 0a56d685a..000000000
--- a/res/drawable-xxhdpi/ic_markunread_wht_24dp.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_menu_mark_read_holo_light.png b/res/drawable-xxhdpi/ic_menu_mark_read_holo_light.png
deleted file mode 100644
index 7809d9318..000000000
--- a/res/drawable-xxhdpi/ic_menu_mark_read_holo_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_menu_mark_read_wht_24dp.png b/res/drawable-xxhdpi/ic_menu_mark_read_wht_24dp.png
new file mode 100644
index 000000000..f5addffa8
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_mark_read_wht_24dp.png
diff --git a/res/drawable-xxhdpi/ic_menu_mark_unread_wht_24dp.png b/res/drawable-xxhdpi/ic_menu_mark_unread_wht_24dp.png
new file mode 100644
index 000000000..9757e4806
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_mark_unread_wht_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_menu_mark_read_wht_24dp.png b/res/drawable-xxxhdpi/ic_menu_mark_read_wht_24dp.png
new file mode 100644
index 000000000..fc9c3e58d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_menu_mark_read_wht_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_menu_mark_unread_wht_24dp.png b/res/drawable-xxxhdpi/ic_menu_mark_unread_wht_24dp.png
new file mode 100644
index 000000000..50c1d6912
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_menu_mark_unread_wht_24dp.png
diff --git a/res/menu-sw600dp-land/conversation_actions.xml b/res/menu-sw600dp-land/conversation_actions.xml
index c4b49b8d5..78325b8ce 100644
--- a/res/menu-sw600dp-land/conversation_actions.xml
+++ b/res/menu-sw600dp-land/conversation_actions.xml
@@ -66,7 +66,7 @@
         android:id="@+id/inside_conversation_unread"
         android:title="@string/mark_unread"
         app:showAsAction="always"
-        android:icon="@drawable/ic_markunread_wht_24dp" />
+        android:icon="@drawable/ic_menu_mark_unread_wht_24dp" />
 
     <item
         android:id="@+id/move_to"
diff --git a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml
index 08bbb5491..1b784bc56 100644
--- a/res/menu-sw600dp-land/conversation_list_search_results_actions.xml
+++ b/res/menu-sw600dp-land/conversation_list_search_results_actions.xml
@@ -34,7 +34,7 @@
         android:id="@+id/inside_conversation_unread"
         android:title="@string/mark_read"
         app:showAsAction="always"
-        android:icon="@drawable/ic_markunread_wht_24dp" />
+        android:icon="@drawable/ic_menu_mark_unread_wht_24dp" />
 
     <item
         android:id="@+id/change_folders"
diff --git a/res/menu/conversation_actions.xml b/res/menu/conversation_actions.xml
index 28057bfd2..9cdb4e89a 100644
--- a/res/menu/conversation_actions.xml
+++ b/res/menu/conversation_actions.xml
@@ -62,7 +62,7 @@
         android:id="@+id/inside_conversation_unread"
         android:title="@string/mark_unread"
         app:showAsAction="always"
-        android:icon="@drawable/ic_markunread_wht_24dp" />
+        android:icon="@drawable/ic_menu_mark_unread_wht_24dp" />
 
     <!-- Always available -->
     <item
diff --git a/res/menu/conversation_list_selection_actions_menu.xml b/res/menu/conversation_list_selection_actions_menu.xml
index a8866ea27..1dc095f32 100644
--- a/res/menu/conversation_list_selection_actions_menu.xml
+++ b/res/menu/conversation_list_selection_actions_menu.xml
@@ -62,13 +62,13 @@
         android:id="@+id/read"
         android:title="@string/mark_read"
         app:showAsAction="always"
-        android:icon="@drawable/ic_menu_mark_read_holo_light" />
+        android:icon="@drawable/ic_menu_mark_read_wht_24dp" />
 
     <item
         android:id="@+id/unread"
         android:title="@string/mark_unread"
         app:showAsAction="always"
-        android:icon="@drawable/ic_markunread_wht_24dp" />
+        android:icon="@drawable/ic_menu_mark_unread_wht_24dp" />
 
     <item
         android:id="@+id/move_to"