diff options
author | Andrew Sapperstein <asapperstein@google.com> | 2014-04-23 00:32:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-23 00:32:20 +0000 |
commit | 04c5d427250168233e21358e6af0725d60d7c914 (patch) | |
tree | 31649d7e1bf248d54410ce15c8454325c24c681b /res | |
parent | 12b31603c9d820bde71bae861a1cfb004c2bd64a (diff) | |
parent | d6ee90404352909bb25360533b3baeab72089099 (diff) | |
download | android_packages_apps_UnifiedEmail-04c5d427250168233e21358e6af0725d60d7c914.tar.gz android_packages_apps_UnifiedEmail-04c5d427250168233e21358e6af0725d60d7c914.tar.bz2 android_packages_apps_UnifiedEmail-04c5d427250168233e21358e6af0725d60d7c914.zip |
am d6ee9040: Merge "Fix b/13624215. Update background colors." into ub-gmail-ur12-dev
* commit 'd6ee90404352909bb25360533b3baeab72089099':
Fix b/13624215. Update background colors.
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/drawer_empty_view.xml | 2 | ||||
-rw-r--r-- | res/layout/drawer_footer_item.xml | 3 | ||||
-rw-r--r-- | res/layout/loading_messages.xml | 2 | ||||
-rw-r--r-- | res/values/colors.xml | 5 |
4 files changed, 7 insertions, 5 deletions
diff --git a/res/layout/drawer_empty_view.xml b/res/layout/drawer_empty_view.xml index b81d1a5da..0e4f79744 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 d890bcfff..40ee298b7 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 f626f610d..b466e518d 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 0ee3d0a6c..d75fbfb5b 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> |