From c1e92f689bd5e0c24c093782d5ea0a0aa58a73b5 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Wed, 5 Mar 2014 13:58:03 -0800
Subject: Restricted the tap target for "All Contacts" to the "All Contacts"
 button alone.  DO NOT MERGE

Bug: 13322769
Change-Id: Iea2bd8886efed50b5b5e463c6e9205af4ad97a6c
(cherry picked from commit 950e3ebcf8059cb6fc2ce0d3a4e1df29be4540db)
---
 res/drawable/background_all_contacts.xml           | 29 ++++++++++++++++++++++
 res/drawable/background_favorites_menu.xml         | 29 ----------------------
 res/layout/phone_favorites_menu.xml                |  8 +++---
 res/values/colors.xml                              |  6 ++---
 .../android/dialer/list/PhoneFavoriteFragment.java |  8 +++---
 5 files changed, 39 insertions(+), 41 deletions(-)
 create mode 100644 res/drawable/background_all_contacts.xml
 delete mode 100644 res/drawable/background_favorites_menu.xml

diff --git a/res/drawable/background_all_contacts.xml b/res/drawable/background_all_contacts.xml
new file mode 100644
index 000000000..0d3703f84
--- /dev/null
+++ b/res/drawable/background_all_contacts.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="false">
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/all_contacts_button_color" />
+        </shape>
+    </item>
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/all_contacts_button_pressed_color" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/res/drawable/background_favorites_menu.xml b/res/drawable/background_favorites_menu.xml
deleted file mode 100644
index 60933fd5e..000000000
--- a/res/drawable/background_favorites_menu.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-  -->
-
-<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" />
-        </shape>
-    </item>
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle" >
-            <solid android:color="@color/favorites_menu_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>
diff --git a/src/com/android/dialer/list/PhoneFavoriteFragment.java b/src/com/android/dialer/list/PhoneFavoriteFragment.java
index 79dbe8c49..675a40f0d 100644
--- a/src/com/android/dialer/list/PhoneFavoriteFragment.java
+++ b/src/com/android/dialer/list/PhoneFavoriteFragment.java
@@ -673,12 +673,12 @@ public class PhoneFavoriteFragment extends Fragment implements OnItemClickListen
 
     /**
      * Prepares the favorites menu which contains the static label "Speed Dial" and the
-     * "All Contacts" button.  Taps anywhere in the view take the user to "All Contacts".
-     * This emulates how the headers in Play Store work.
+     * "All Contacts" button.  Sets the onClickListener for the "All Contacts" button.
      */
     private void prepareFavoritesMenu(View favoritesMenu) {
-        // Set the onClick listener for the view to bring up the all contacts view.
-        favoritesMenu.setOnClickListener(new OnClickListener() {
+        Button allContactsButton = (Button) favoritesMenu.findViewById(R.id.all_contacts_button);
+        // Set the onClick listener for the button to bring up the all contacts view.
+        allContactsButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View view) {
                 showAllContacts();
-- 
cgit v1.2.3