From 5387ddb2da7291341663c15375de266f377b07d3 Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Thu, 26 Mar 2015 12:16:20 -0700
Subject: Move Report-Bad-Data toast to GoogleDialer.

Bug: 19949319
Change-Id: I32a2217a24915a7d862a1c9d521fc0c45f0ecb68
---
 res/values/strings.xml                              | 4 ----
 src/com/android/dialer/calllog/CallLogAdapter.java  | 9 ---------
 src/com/android/dialer/calllog/CallLogFragment.java | 2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 28dab88e1..4c4921d31 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -627,10 +627,6 @@
          [CHAR LIMIT=NONE] -->
     <string name="toast_entry_removed">Deleted from call history</string>
 
-    <!-- Toast message which appears when a call log contact is reported.
-         [CHAR LIMIT=NONE] -->
-    <string name="toast_caller_id_reported">Number reported to Google</string>
-
     <!-- Button text for the "report" button displayed underneath an entry in the call log.
          Tapping causes the call log entry to be reported to Google as a bad id.
          [CHAR LIMIT=30] -->
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index aa2c1df43..121851733 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -41,7 +41,6 @@ import android.view.ViewTreeObserver;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.android.common.widget.GroupingListAdapter;
 import com.android.contacts.common.CallUtil;
@@ -145,7 +144,6 @@ public class CallLogAdapter extends GroupingListAdapter
     protected final Context mContext;
     private final ContactInfoHelper mContactInfoHelper;
     private final CallFetcher mCallFetcher;
-    private final Toast mReportedToast;
     private final OnReportButtonClickListener mOnReportButtonClickListener;
     private ViewTreeObserver mViewTreeObserver = null;
 
@@ -351,8 +349,6 @@ public class CallLogAdapter extends GroupingListAdapter
         mCallItemExpandedListener = callItemExpandedListener;
 
         mOnReportButtonClickListener = onReportButtonClickListener;
-        mReportedToast = Toast.makeText(mContext, R.string.toast_caller_id_reported,
-                Toast.LENGTH_SHORT);
 
         mContactInfoCache = ExpirableCache.create(CONTACT_INFO_CACHE_SIZE);
         mRequests = new LinkedList<ContactInfoRequest>();
@@ -1332,11 +1328,6 @@ public class CallLogAdapter extends GroupingListAdapter
        }
     }
 
-    public void onBadDataReported(String number) {
-        mContactInfoCache.expireAll();
-        mReportedToast.show();
-    }
-
     /**
      * Manages the state changes for the UI interaction where a call log row is expanded.
      *
diff --git a/src/com/android/dialer/calllog/CallLogFragment.java b/src/com/android/dialer/calllog/CallLogFragment.java
index 6d07301df..c4e453c33 100644
--- a/src/com/android/dialer/calllog/CallLogFragment.java
+++ b/src/com/android/dialer/calllog/CallLogFragment.java
@@ -672,7 +672,7 @@ public class CallLogFragment extends ListFragment
         if (number == null) {
             return;
         }
-        mAdapter.onBadDataReported(number);
+        mAdapter.invalidateCache();
         mAdapter.notifyDataSetChanged();
     }
 
-- 
cgit v1.2.3