Minor bug fixes

- alignment of lookup status message within call card fragment

- spam text in call notification

- toggle visibility of attribution logo as it was split from the
  attribution text into its own view

- properly handle non-successful responses within ContactInfoCache
  for lookup requests

Change-Id: I5d3bf2e9510b9f289f81e0a930ffc3b142f49de8
Issue-Id: OPO-726
(cherry picked from commit 64cdcef2df3f7226756e60e05eccce2a50a79048)

4 files changed, 4 insertions, 2 deletions

diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
index ff5fa5b4..7c6fcccb 100644
--- a/res/layout/primary_call_info.xml
+++ b/res/layout/primary_call_info.xml
@@ -200,6 +200,7 @@
         android:layout_width="wrap_content"
         android:textSize="@dimen/contact_info_provider_status_msg_text_size"
         android:textColor="@color/incall_call_banner_text_color"
+        android:gravity="start"
         android:visibility="gone" />
 
 </LinearLayout>  <!-- End of call_banner -->
diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java
index b24bf427..e88791c2 100644
--- a/src/com/android/incallui/CallCardFragment.java
+++ b/src/com/android/incallui/CallCardFragment.java
@@ -1364,6 +1364,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         }
         mLookupStatusMessage.setVisibility(showLookupStatus ? View.VISIBLE : View.GONE);
         mContactInfoAttributionText.setVisibility(showContactAttribution ? View.VISIBLE : View.GONE);
+        mContactInfoAttributionLogo.setVisibility(showContactAttribution ? View.VISIBLE : View.GONE);
     }
 
     public void onDialpadVisibilityChange(boolean isShown) {
diff --git a/src/com/android/incallui/ContactInfoCache.java b/src/com/android/incallui/ContactInfoCache.java
index e85abfa4..9e2d09e6 100644
--- a/src/com/android/incallui/ContactInfoCache.java
+++ b/src/com/android/incallui/ContactInfoCache.java
@@ -458,7 +458,7 @@ public class ContactInfoCache implements ContactsAsyncHelper.OnImageLoadComplete
             oldEntry.isLookupInProgress = false;
             oldEntry.lookupStatus = response.mStatusCode;
 
-            if (response == null) {
+            if (response == null || response.mStatusCode != StatusCode.SUCCESS) {
                 oldEntry.lookupProviderName = mLookupProvider.getDisplayName();
                 oldEntry.lookupStatus = StatusCode.FAIL;
                 mMainHandler.post(new Runnable() {
diff --git a/src/com/android/incallui/StatusBarNotifier.java b/src/com/android/incallui/StatusBarNotifier.java
index 0aa1c80a..0595bf14 100644
--- a/src/com/android/incallui/StatusBarNotifier.java
+++ b/src/com/android/incallui/StatusBarNotifier.java
@@ -285,7 +285,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener,
 
         if (contactInfo.isSpam) {
             subTextContent = mContext.getResources().getQuantityString(R.plurals.spam_count_text,
-                    contactInfo.spamCount);
+                    contactInfo.spamCount, contactInfo.spamCount);
         }
 
         if (!TextUtils.isEmpty(subTextContent)) {