commit 5bc77c36ff426c8ed1d28b3044d94d121159edff
author Brian Attwell <brianattwell@google.com> Thu Jun 26 23:55:07 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 26 17:57:04 2014 +0000
tree cdc80008892e332240a1c5669289ae869e5c2d3f
parent b9cdb2f63ad5e381fd4a193f5c3afd69a0fed7c1
parent 4462dfdc1541b3777e562695f11d290860cf2b5f

Merge "Remove one layer of overdraw from cards"

src/com/android/contacts/detail/ContactDetailFragment.java

diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index 6573fa2..805ee39 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -1357,6 +1357,10 @@
             return true;
         }
 
+        public boolean shouldCollapseWith(DetailViewEntry entry, Context context) {
+            return false;
+        }
+
         @Override
         public void click(View clickedView, Listener fragmentListener) {
             if (fragmentListener == null || intent == null) return;

src/com/android/contacts/quickcontact/DataAction.java

diff --git a/src/com/android/contacts/quickcontact/DataAction.java b/src/com/android/contacts/quickcontact/DataAction.java
index a0df1e6..37021ec 100644
--- a/src/com/android/contacts/quickcontact/DataAction.java
+++ b/src/com/android/contacts/quickcontact/DataAction.java
@@ -334,6 +334,10 @@
         return true;
     }
 
+    public boolean shouldCollapseWith(Action t, Context context) {
+        return false;
+    }
+
     @Override
     public Integer getTimesUsed() {
         return mTimesUsed;