From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Fri, 9 Jun 2017 14:16:05 +0000
Subject: Revert "Update AOSP Dialer source from internal google3 repository at
 cl/158012278. am: 91ce7d2a47"

This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.

Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.

Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
---
 .../android/contacts/common/list/ContactTileView.java | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'java/com/android/contacts/common/list/ContactTileView.java')

diff --git a/java/com/android/contacts/common/list/ContactTileView.java b/java/com/android/contacts/common/list/ContactTileView.java
index 15582d684..9273b0583 100644
--- a/java/com/android/contacts/common/list/ContactTileView.java
+++ b/java/com/android/contacts/common/list/ContactTileView.java
@@ -19,6 +19,7 @@ import android.content.Context;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -27,9 +28,6 @@ import com.android.contacts.common.ContactPhotoManager;
 import com.android.contacts.common.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.common.MoreContactUtils;
 import com.android.contacts.common.R;
-import com.android.dialer.callintent.CallInitiationType;
-import com.android.dialer.callintent.CallSpecificAppData;
-import com.android.dialer.common.LogUtil;
 
 /** A ContactTile displays a contact's picture and name */
 public abstract class ContactTileView extends FrameLayout {
@@ -62,14 +60,8 @@ public abstract class ContactTileView extends FrameLayout {
         if (mListener == null) {
           return;
         }
-        CallSpecificAppData callSpecificAppData =
-            CallSpecificAppData.newBuilder()
-                .setCallInitiationType(CallInitiationType.Type.SPEED_DIAL)
-                .build();
         mListener.onContactSelected(
-            getLookupUri(),
-            MoreContactUtils.getTargetRectFromView(ContactTileView.this),
-            callSpecificAppData);
+            getLookupUri(), MoreContactUtils.getTargetRectFromView(ContactTileView.this));
       }
     };
   }
@@ -105,7 +97,7 @@ public abstract class ContactTileView extends FrameLayout {
 
         }
       } else {
-        LogUtil.w(TAG, "contactPhotoManager not set");
+        Log.w(TAG, "contactPhotoManager not set");
       }
     } else {
       setVisibility(View.INVISIBLE);
@@ -171,10 +163,9 @@ public abstract class ContactTileView extends FrameLayout {
   public interface Listener {
 
     /** Notification that the contact was selected; no specific action is dictated. */
-    void onContactSelected(
-        Uri contactLookupUri, Rect viewRect, CallSpecificAppData callSpecificAppData);
+    void onContactSelected(Uri contactLookupUri, Rect viewRect);
 
     /** Notification that the specified number is to be called. */
-    void onCallNumberDirectly(String phoneNumber, CallSpecificAppData callSpecificAppData);
+    void onCallNumberDirectly(String phoneNumber);
   }
 }
-- 
cgit v1.2.3