am 90092bfb: Merge "Restricted the tap target for "All Contacts" to the "All Contacts" button alone. DO NOT MERGE" into klp-dev

* commit '90092bfb8865ca8e25f525ca51afd1174cf6544c':
  Restricted the tap target for "All Contacts" to the "All Contacts" button alone.  DO NOT MERGE

3 files changed, 8 insertions, 10 deletions

diff --git a/res/drawable/background_favorites_menu.xml b/res/drawable/background_all_contacts.xml
index 60933fd5e..0d3703f84 100644
--- a/res/drawable/background_favorites_menu.xml
+++ b/res/drawable/background_all_contacts.xml
@@ -18,12 +18,12 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="false">
         <shape android:shape="rectangle" >
-            <solid android:color="@color/favorites_menu_background_color" />
+            <solid android:color="@color/all_contacts_button_color" />
         </shape>
     </item>
     <item android:state_pressed="true">
         <shape android:shape="rectangle" >
-            <solid android:color="@color/favorites_menu_pressed_color" />
+            <solid android:color="@color/all_contacts_button_pressed_color" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/res/layout/phone_favorites_menu.xml b/res/layout/phone_favorites_menu.xml
index 5f7a5a630..387ea5b3f 100644
--- a/res/layout/phone_favorites_menu.xml
+++ b/res/layout/phone_favorites_menu.xml
@@ -25,8 +25,7 @@
                 android:paddingRight="@dimen/favorites_menu_padding_horizontal"
                 android:paddingTop="@dimen/favorites_menu_padding_top"
                 android:paddingBottom="@dimen/favorites_menu_padding_bottom"
-                android:background="@drawable/background_favorites_menu"
-                android:addStatesFromChildren="true"
+                android:background="@color/favorites_menu_background_color"
         >
     <TextView
             android:layout_width="wrap_content"
@@ -39,7 +38,7 @@
             android:layout_centerVertical="true"
             android:gravity="center"
         />
-    <TextView
+    <Button
             android:id="@+id/all_contacts_button"
             android:fontFamily="@string/favorites_menu_all_contacts_font_family"
             android:layout_width="wrap_content"
@@ -48,11 +47,10 @@
             android:paddingRight="@dimen/favorites_menu_padding_horizontal"
             android:text="@string/favorites_menu_all_contacts"
             android:textSize="@dimen/favorites_menu_all_contacts_text_size"
-            android:background="@color/all_contacts_button_color"
+            android:background="@drawable/background_all_contacts"
             android:textColor="@color/all_contacts_button_text_color"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:gravity="center"
-            android:focusable="true"
         />
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5de0e02c0..e6fef3f05 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -92,11 +92,11 @@
     <!-- Background color for the "All Contacts" button in the favorites menu. -->
     <color name="all_contacts_button_color">#999999</color>
 
-    <!-- Background color for the favorites menu when pressed. -->
-    <color name="favorites_menu_pressed_color">#d6d6d6</color>
+    <!-- Background color for the "All Contacts" button in the favorites menu when pressed. -->
+    <color name="all_contacts_button_pressed_color">#808080</color>
 
     <!-- Background color for the favorites menu. -->
-    <color name="favorites_menu_background_color">#ebebeb</color>
+    <color name="favorites_menu_background_color">#eeeeee</color>
 
     <!-- Text color for the "All Contacts" button above the favorite callers -->
     <color name="all_contacts_button_text_color">#ffffff</color>