Merge "Drawer updates for darkened icons" into ub-gmail-ur14-dev

56 files changed, 8 insertions, 4 deletions

diff --git a/res/drawable-hdpi/ic_drawer_drafts_24dp.png b/res/drawable-hdpi/ic_drawer_drafts_24dp.png
index 949072ca6..0b7bc9792 100644
--- a/res/drawable-hdpi/ic_drawer_drafts_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_drafts_24dp.png
diff --git a/res/drawable-hdpi/ic_drawer_folder_24dp.png b/res/drawable-hdpi/ic_drawer_folder_24dp.png
index 2d3db4758..69f4a18cc 100644
--- a/res/drawable-hdpi/ic_drawer_folder_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_folder_24dp.png
diff --git a/res/drawable-hdpi/ic_drawer_help_24dp.png b/res/drawable-hdpi/ic_drawer_help_24dp.png
index c7a1081cf..324498c0d 100644
--- a/res/drawable-hdpi/ic_drawer_help_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_help_24dp.png
diff --git a/res/drawable-hdpi/ic_drawer_inbox_24dp.png b/res/drawable-hdpi/ic_drawer_inbox_24dp.png
index aa987f81e..54c04eaf7 100644
--- a/res/drawable-hdpi/ic_drawer_inbox_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_inbox_24dp.png
diff --git a/res/drawable-hdpi/ic_drawer_outbox_24dp.png b/res/drawable-hdpi/ic_drawer_outbox_24dp.png
index dd6ffe384..3119d9a9d 100644
--- a/res/drawable-hdpi/ic_drawer_outbox_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_outbox_24dp.png
diff --git a/res/drawable-hdpi/ic_drawer_sent_24dp.png b/res/drawable-hdpi/ic_drawer_sent_24dp.png
index 0cbdfaba9..b771392ed 100644
--- a/res/drawable-hdpi/ic_drawer_sent_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_sent_24dp.png
diff --git a/res/drawable-hdpi/ic_drawer_settings_24dp.png b/res/drawable-hdpi/ic_drawer_settings_24dp.png
index 30ce2577a..3e4d23436 100644
--- a/res/drawable-hdpi/ic_drawer_settings_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_settings_24dp.png
diff --git a/res/drawable-hdpi/ic_drawer_starred_24dp.png b/res/drawable-hdpi/ic_drawer_starred_24dp.png
index 41e657c21..de7502f9d 100644
--- a/res/drawable-hdpi/ic_drawer_starred_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_starred_24dp.png
diff --git a/res/drawable-hdpi/ic_drawer_trash_24dp.png b/res/drawable-hdpi/ic_drawer_trash_24dp.png
index a9451feb8..b72a9f3c6 100644
--- a/res/drawable-hdpi/ic_drawer_trash_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_trash_24dp.png
diff --git a/res/drawable-hdpi/ic_drawer_unread_24dp.png b/res/drawable-hdpi/ic_drawer_unread_24dp.png
index ed21b08c3..56c0a8c94 100644
--- a/res/drawable-hdpi/ic_drawer_unread_24dp.png
+++ b/res/drawable-hdpi/ic_drawer_unread_24dp.png
diff --git a/res/drawable-hdpi/ic_folder_parent_24dp.png b/res/drawable-hdpi/ic_folder_parent_24dp.png
index 68a6f4abf..5b709603a 100644
--- a/res/drawable-hdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-hdpi/ic_folder_parent_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_drafts_24dp.png b/res/drawable-mdpi/ic_drawer_drafts_24dp.png
index d899d1767..e53cf4a42 100644
--- a/res/drawable-mdpi/ic_drawer_drafts_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_drafts_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_folder_24dp.png b/res/drawable-mdpi/ic_drawer_folder_24dp.png
index c079acfee..1028bfaf3 100644
--- a/res/drawable-mdpi/ic_drawer_folder_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_folder_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_help_24dp.png b/res/drawable-mdpi/ic_drawer_help_24dp.png
index bf6212fca..1efd1b54c 100644
--- a/res/drawable-mdpi/ic_drawer_help_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_help_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_inbox_24dp.png b/res/drawable-mdpi/ic_drawer_inbox_24dp.png
index 665c994ed..6034b8aa9 100644
--- a/res/drawable-mdpi/ic_drawer_inbox_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_inbox_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_outbox_24dp.png b/res/drawable-mdpi/ic_drawer_outbox_24dp.png
index b5589d38f..f20466c9a 100644
--- a/res/drawable-mdpi/ic_drawer_outbox_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_outbox_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_sent_24dp.png b/res/drawable-mdpi/ic_drawer_sent_24dp.png
index 14a6dbd1b..6fef4883d 100644
--- a/res/drawable-mdpi/ic_drawer_sent_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_sent_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_settings_24dp.png b/res/drawable-mdpi/ic_drawer_settings_24dp.png
index 0ec76c722..d2963c26c 100644
--- a/res/drawable-mdpi/ic_drawer_settings_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_settings_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_starred_24dp.png b/res/drawable-mdpi/ic_drawer_starred_24dp.png
index 39c03cdfa..89b79c49b 100644
--- a/res/drawable-mdpi/ic_drawer_starred_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_starred_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_trash_24dp.png b/res/drawable-mdpi/ic_drawer_trash_24dp.png
index c1583bdda..e757fdb07 100644
--- a/res/drawable-mdpi/ic_drawer_trash_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_trash_24dp.png
diff --git a/res/drawable-mdpi/ic_drawer_unread_24dp.png b/res/drawable-mdpi/ic_drawer_unread_24dp.png
index 75e11cd7b..b971cd9fd 100644
--- a/res/drawable-mdpi/ic_drawer_unread_24dp.png
+++ b/res/drawable-mdpi/ic_drawer_unread_24dp.png
diff --git a/res/drawable-mdpi/ic_folder_parent_24dp.png b/res/drawable-mdpi/ic_folder_parent_24dp.png
index 99d50760f..87bd54783 100644
--- a/res/drawable-mdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-mdpi/ic_folder_parent_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_drafts_24dp.png b/res/drawable-xhdpi/ic_drawer_drafts_24dp.png
index 7df7fc423..ca03046da 100644
--- a/res/drawable-xhdpi/ic_drawer_drafts_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_drafts_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_folder_24dp.png b/res/drawable-xhdpi/ic_drawer_folder_24dp.png
index 02cb6cd19..b4702e454 100644
--- a/res/drawable-xhdpi/ic_drawer_folder_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_folder_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_help_24dp.png b/res/drawable-xhdpi/ic_drawer_help_24dp.png
index 7a0d07e69..d92a4fcf2 100644
--- a/res/drawable-xhdpi/ic_drawer_help_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_help_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_inbox_24dp.png b/res/drawable-xhdpi/ic_drawer_inbox_24dp.png
index 7b70348d8..6f8eb17a7 100644
--- a/res/drawable-xhdpi/ic_drawer_inbox_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_inbox_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_outbox_24dp.png b/res/drawable-xhdpi/ic_drawer_outbox_24dp.png
index b1ddedc35..fee5e79e8 100644
--- a/res/drawable-xhdpi/ic_drawer_outbox_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_outbox_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_sent_24dp.png b/res/drawable-xhdpi/ic_drawer_sent_24dp.png
index a25f185e8..b2aeb4baf 100644
--- a/res/drawable-xhdpi/ic_drawer_sent_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_sent_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_settings_24dp.png b/res/drawable-xhdpi/ic_drawer_settings_24dp.png
index cda51d417..69a7cf05d 100644
--- a/res/drawable-xhdpi/ic_drawer_settings_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_settings_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_starred_24dp.png b/res/drawable-xhdpi/ic_drawer_starred_24dp.png
index 11d7f30a6..123c09417 100644
--- a/res/drawable-xhdpi/ic_drawer_starred_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_starred_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_trash_24dp.png b/res/drawable-xhdpi/ic_drawer_trash_24dp.png
index e1e74a5ff..d8cb09a13 100644
--- a/res/drawable-xhdpi/ic_drawer_trash_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_trash_24dp.png
diff --git a/res/drawable-xhdpi/ic_drawer_unread_24dp.png b/res/drawable-xhdpi/ic_drawer_unread_24dp.png
index 7226408ae..9e0134126 100644
--- a/res/drawable-xhdpi/ic_drawer_unread_24dp.png
+++ b/res/drawable-xhdpi/ic_drawer_unread_24dp.png
diff --git a/res/drawable-xhdpi/ic_folder_parent_24dp.png b/res/drawable-xhdpi/ic_folder_parent_24dp.png
index da1655c11..a4133b170 100644
--- a/res/drawable-xhdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-xhdpi/ic_folder_parent_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_drafts_24dp.png b/res/drawable-xxhdpi/ic_drawer_drafts_24dp.png
index bef77277a..b13c27fa7 100644
--- a/res/drawable-xxhdpi/ic_drawer_drafts_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_drafts_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_folder_24dp.png b/res/drawable-xxhdpi/ic_drawer_folder_24dp.png
index ba057d22a..c885e881e 100644
--- a/res/drawable-xxhdpi/ic_drawer_folder_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_folder_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_help_24dp.png b/res/drawable-xxhdpi/ic_drawer_help_24dp.png
index d00e59f1b..d9e53009e 100644
--- a/res/drawable-xxhdpi/ic_drawer_help_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_help_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_inbox_24dp.png b/res/drawable-xxhdpi/ic_drawer_inbox_24dp.png
index 060aa96e2..8b44898df 100644
--- a/res/drawable-xxhdpi/ic_drawer_inbox_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_inbox_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_outbox_24dp.png b/res/drawable-xxhdpi/ic_drawer_outbox_24dp.png
index 96261e4a6..74b799ba4 100644
--- a/res/drawable-xxhdpi/ic_drawer_outbox_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_outbox_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_sent_24dp.png b/res/drawable-xxhdpi/ic_drawer_sent_24dp.png
index 3ded90d50..24b0e9aa3 100644
--- a/res/drawable-xxhdpi/ic_drawer_sent_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_sent_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_settings_24dp.png b/res/drawable-xxhdpi/ic_drawer_settings_24dp.png
index f9b0d97d4..743ca6782 100644
--- a/res/drawable-xxhdpi/ic_drawer_settings_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_settings_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_starred_24dp.png b/res/drawable-xxhdpi/ic_drawer_starred_24dp.png
index 714f236f8..ceed17031 100644
--- a/res/drawable-xxhdpi/ic_drawer_starred_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_starred_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_trash_24dp.png b/res/drawable-xxhdpi/ic_drawer_trash_24dp.png
index 968955503..4886ab1e9 100644
--- a/res/drawable-xxhdpi/ic_drawer_trash_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_trash_24dp.png
diff --git a/res/drawable-xxhdpi/ic_drawer_unread_24dp.png b/res/drawable-xxhdpi/ic_drawer_unread_24dp.png
index 938718ac8..9b1c7e841 100644
--- a/res/drawable-xxhdpi/ic_drawer_unread_24dp.png
+++ b/res/drawable-xxhdpi/ic_drawer_unread_24dp.png
diff --git a/res/drawable-xxhdpi/ic_folder_parent_24dp.png b/res/drawable-xxhdpi/ic_folder_parent_24dp.png
index 06cc04afe..19f2e4be6 100644
--- a/res/drawable-xxhdpi/ic_folder_parent_24dp.png
+++ b/res/drawable-xxhdpi/ic_folder_parent_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png b/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png
index cef9c34f8..a2a58be39 100644
--- a/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_drafts_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png b/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png
index 003a6901c..1bd36266f 100644
--- a/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_folder_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_help_24dp.png b/res/drawable-xxxhdpi/ic_drawer_help_24dp.png
index fb48fbd9e..667aea889 100644
--- a/res/drawable-xxxhdpi/ic_drawer_help_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_help_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png b/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png
index 708b41d10..17977510c 100644
--- a/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_inbox_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png b/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png
index 280f9c6d3..7d1ad2910 100644
--- a/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_outbox_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png b/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png
index 66af988e4..23e475e58 100644
--- a/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_sent_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png b/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png
index d71793d37..83b92c4fa 100644
--- a/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_settings_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png b/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png
index 242bdddf8..d1b77caf8 100644
--- a/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_starred_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png b/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png
index 547f5d1b4..3bf1f7e8e 100644
--- a/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_trash_24dp.png
diff --git a/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png b/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png
index f20c4bf3c..a36596d65 100644
--- a/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png
+++ b/res/drawable-xxxhdpi/ic_drawer_unread_24dp.png
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 000000000..d218c6c4d
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_folder_parent_24dp.png
diff --git a/res/layout/folder_list_blank_header.xml b/res/layout/folder_list_blank_header.xml
index 2285ce265..083733898 100644
--- a/res/layout/folder_list_blank_header.xml
+++ b/res/layout/folder_list_blank_header.xml
@@ -15,8 +15,12 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<View xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/divider_height"
-    android:layout_marginBottom="8dp"
-    android:background="@color/folder_list_divider_color" />
+    android:layout_height="wrap_content" >
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_height"
+        android:layout_marginBottom="8dp"
+        android:background="@color/folder_list_divider_color" />
+</FrameLayout>
\ No newline at end of file