Merge "Fix b/13624215. Update background colors." into ub-gmail-ur12-dev
diff --git a/res/layout/drawer_empty_view.xml b/res/layout/drawer_empty_view.xml
index b81d1a5..0e4f797 100644
--- a/res/layout/drawer_empty_view.xml
+++ b/res/layout/drawer_empty_view.xml
@@ -23,6 +23,8 @@
android:id="@+id/empty_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingTop="10dp"
+ android:paddingBottom="20dp"
android:gravity="center_horizontal">
<ProgressBar
diff --git a/res/layout/drawer_footer_item.xml b/res/layout/drawer_footer_item.xml
index d890bcf..40ee298 100644
--- a/res/layout/drawer_footer_item.xml
+++ b/res/layout/drawer_footer_item.xml
@@ -19,8 +19,7 @@
<!-- Item in the drawer that launches the Help or Feedback activities. -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/footer_background_color">
+ android:layout_height="wrap_content" >
<LinearLayout
android:layout_height="wrap_content"
diff --git a/res/layout/loading_messages.xml b/res/layout/loading_messages.xml
index f626f61..b466e51 100644
--- a/res/layout/loading_messages.xml
+++ b/res/layout/loading_messages.xml
@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
- android:background="@color/footer_background_color">
+ android:background="@color/loading_messages_background_color">
<ImageView
android:id="@+id/loading_icon"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0ee3d0a..d75fbfb 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -45,8 +45,7 @@
<!-- Folder List/Drawer colors -->
<color name="account_item_selected_text_color">@color/mail_app_blue</color>
<color name="folder_list_heading_text_color">@color/dark_gray_text_color</color>
- <color name="list_background_color">@android:color/white</color>
- <color name="footer_background_color">#eeeeee</color>
+ <color name="list_background_color">#f5f5f5</color>
<color name="separator_color">#bebebe</color>
<!-- Compose colors -->
@@ -138,4 +137,6 @@
<color name="swipe_refresh_color4">#fff4b400</color>
<color name="badge_background_color">#edb802</color>
+
+ <color name="loading_messages_background_color">#eeeeee</color>
</resources>