From fe3fbd24097c51290b189f2788059c4083dd90a1 Mon Sep 17 00:00:00 2001
From: Christine Chen <christinech@google.com>
Date: Thu, 26 Sep 2013 19:38:31 -0700
Subject: Revert no favorite card background change

Bug: 10862541
Change-Id: I52cbb8b2cfce90c315e42e89935fc7225f8d39fc
---
 res/drawable-hdpi/no_favorites_banner.png          | Bin 7554 -> 7788 bytes
 res/drawable-mdpi/no_favorites_banner.png          | Bin 4776 -> 5129 bytes
 res/drawable-xhdpi/no_favorites_banner.png         | Bin 10881 -> 11886 bytes
 res/drawable-xxhdpi/no_favorites_banner.png        | Bin 15409 -> 16342 bytes
 res/layout/phone_no_favorites.xml                  |  15 +++-----
 res/values/colors.xml                              |   4 +--
 .../android/dialer/list/PhoneFavoriteFragment.java |  38 +--------------------
 7 files changed, 7 insertions(+), 50 deletions(-)

diff --git a/res/drawable-hdpi/no_favorites_banner.png b/res/drawable-hdpi/no_favorites_banner.png
index 5ab45ab46..a4b09c0a9 100644
Binary files a/res/drawable-hdpi/no_favorites_banner.png and b/res/drawable-hdpi/no_favorites_banner.png differ
diff --git a/res/drawable-mdpi/no_favorites_banner.png b/res/drawable-mdpi/no_favorites_banner.png
index 808d573e8..ac080b9e1 100644
Binary files a/res/drawable-mdpi/no_favorites_banner.png and b/res/drawable-mdpi/no_favorites_banner.png differ
diff --git a/res/drawable-xhdpi/no_favorites_banner.png b/res/drawable-xhdpi/no_favorites_banner.png
index da71882c3..bae4e99b8 100644
Binary files a/res/drawable-xhdpi/no_favorites_banner.png and b/res/drawable-xhdpi/no_favorites_banner.png differ
diff --git a/res/drawable-xxhdpi/no_favorites_banner.png b/res/drawable-xxhdpi/no_favorites_banner.png
index 518e8efbd..0e2a4fa3b 100644
Binary files a/res/drawable-xxhdpi/no_favorites_banner.png and b/res/drawable-xxhdpi/no_favorites_banner.png 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>
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index aa81858f3..828ca70d4 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -314,43 +314,7 @@ public class PhoneFavoriteFragment extends Fragment implements OnItemClickListen
         final int newVisibility = visible ? View.VISIBLE : View.GONE;
 
         if (previousVisibility != newVisibility) {
-            Integer colorFrom = visible ?
-                    getResources().getColor(R.color.background_dialer_light) :
-                    getResources().getColor(R.color.nofavorite_background_color);
-            Integer colorTo = visible ?
-                    getResources().getColor(R.color.nofavorite_background_color) :
-                    getResources().getColor(R.color.background_dialer_light);
-            ValueAnimator colorAnimation = ValueAnimator.ofObject(new ArgbEvaluator(),
-                    colorFrom, colorTo);
-            colorAnimation.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-                @Override
-                public void onAnimationUpdate(ValueAnimator animator) {
-                    mParentView.setBackgroundColor((Integer)animator.getAnimatedValue());
-                }
-            });
-            colorAnimation.addListener(new Animator.AnimatorListener() {
-                @Override
-                public void onAnimationStart(Animator animator) {
-                    if (!visible) {
-                        mEmptyView.setVisibility(View.GONE);
-                    }
-                }
-
-                @Override
-                public void onAnimationEnd(Animator animator) {
-                    if (visible) {
-                        mEmptyView.setVisibility(View.VISIBLE);
-                    }
-                }
-
-                @Override
-                public void onAnimationCancel(Animator animator) {}
-
-                @Override
-                public void onAnimationRepeat(Animator animator) {}
-            });
-
-            colorAnimation.start();
+            mEmptyView.setVisibility(newVisibility);
         }
     }
 
-- 
cgit v1.2.3