summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorChristine Chen <christinech@google.com>2013-09-26 19:38:31 -0700
committerChristine Chen <christinech@google.com>2013-09-26 19:39:13 -0700
commitfe3fbd24097c51290b189f2788059c4083dd90a1 (patch)
treea27e50f2d80be9d491eb222fa1036fe452284a8f /res
parent08f732988fa1681def754f2e56053599eca77ffd (diff)
Revert no favorite card background change
Bug: 10862541 Change-Id: I52cbb8b2cfce90c315e42e89935fc7225f8d39fc
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/no_favorites_banner.pngbin7554 -> 7788 bytes
-rw-r--r--res/drawable-mdpi/no_favorites_banner.pngbin4776 -> 5129 bytes
-rw-r--r--res/drawable-xhdpi/no_favorites_banner.pngbin10881 -> 11886 bytes
-rw-r--r--res/drawable-xxhdpi/no_favorites_banner.pngbin15409 -> 16342 bytes
-rw-r--r--res/layout/phone_no_favorites.xml15
-rw-r--r--res/values/colors.xml4
6 files changed, 6 insertions, 13 deletions
diff --git a/res/drawable-hdpi/no_favorites_banner.png b/res/drawable-hdpi/no_favorites_banner.png
index 5ab45ab46..a4b09c0a9 100644
--- a/res/drawable-hdpi/no_favorites_banner.png
+++ b/res/drawable-hdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/drawable-mdpi/no_favorites_banner.png b/res/drawable-mdpi/no_favorites_banner.png
index 808d573e8..ac080b9e1 100644
--- a/res/drawable-mdpi/no_favorites_banner.png
+++ b/res/drawable-mdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/drawable-xhdpi/no_favorites_banner.png b/res/drawable-xhdpi/no_favorites_banner.png
index da71882c3..bae4e99b8 100644
--- a/res/drawable-xhdpi/no_favorites_banner.png
+++ b/res/drawable-xhdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/drawable-xxhdpi/no_favorites_banner.png b/res/drawable-xxhdpi/no_favorites_banner.png
index 518e8efbd..0e2a4fa3b 100644
--- a/res/drawable-xxhdpi/no_favorites_banner.png
+++ b/res/drawable-xxhdpi/no_favorites_banner.png
Binary files differ
diff --git a/res/layout/phone_no_favorites.xml b/res/layout/phone_no_favorites.xml
index e0635de2c..cc9b1ffad 100644
--- a/res/layout/phone_no_favorites.xml
+++ b/res/layout/phone_no_favorites.xml
@@ -33,19 +33,14 @@
android:paddingBottom="16dp"
android:src="@drawable/no_favorites_banner" />
- <FrameLayout
- android:id="@+id/show_all_contact_button_in_nofav_frame"
+ <include
+ android:id="@+id/show_all_contact_button_in_nofav"
+ layout="@layout/show_all_contact_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:background="@color/background_dialer_list_items">
-
- <include
- android:id="@+id/show_all_contact_button_in_nofav"
- layout="@layout/show_all_contact_button" />
- </FrameLayout>
+ android:layout_alignParentStart="true"/>
<TextView
android:id="@+id/title"
@@ -54,7 +49,7 @@
android:layout_gravity="center"
android:gravity="center"
android:layout_below="@id/nofavorite_image"
- android:layout_above="@id/show_all_contact_button_in_nofav_frame"
+ android:layout_above="@id/show_all_contact_button_in_nofav"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:text="@string/no_favorites"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3c3d41f53..439ccc229 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -68,8 +68,6 @@
<!-- Undo dialogue color -->
<color name="undo_dialogue_text_color">#4d4d4d</color>
- <!-- Background color for no favorites state -->
- <color name="nofavorite_background_color">#ffffff</color>
<!-- Text color for no favorites message -->
- <color name="nofavorite_text_color">#a9a9a9</color>
+ <color name="nofavorite_text_color">#777777</color>
</resources>