From f7d0833a26ce4072a20cfb7cea01aeb9668c5d28 Mon Sep 17 00:00:00 2001
From: wangqi <wangqi@google.com>
Date: Thu, 17 May 2018 17:03:30 -0700
Subject: Add more Cequint provider.

Bug: 64975757
Test: none
PiperOrigin-RevId: 197074854
Change-Id: I56696fef1e76d72bbb2ef639cdd4257321cacc94
---
 java/com/android/dialer/oem/res/values/motorola_config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/com/android/dialer/oem/res/values/motorola_config.xml b/java/com/android/dialer/oem/res/values/motorola_config.xml
index 47f9287b6..56bfb6570 100644
--- a/java/com/android/dialer/oem/res/values/motorola_config.xml
+++ b/java/com/android/dialer/oem/res/values/motorola_config.xml
@@ -81,6 +81,7 @@
        used for different carriers-->
   <string-array name="cequint_providers">
     <item>com.cequint.ecid</item>
+    <item>com.vzw.ecid</item>
   </string-array>
 
   <!-- Flag to control whether to disable phone number formatting -->
-- 
cgit v1.2.3


From 9b902f58e9a1a81376633d24d5360cf56071c56c Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Thu, 17 May 2018 17:19:33 -0700
Subject: Handle null returned from
 TelecomManager.getCallCapablePhoneAccounts()

Usually it is non-null, but not true for some OEMs.

TEST=TAP
Bug: 73905236
Test: TAP
PiperOrigin-RevId: 197076980
Change-Id: Ie58ecf2ab392e3393d190cefe9815b6bb8542800
---
 java/com/android/dialer/telecom/TelecomUtil.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/com/android/dialer/telecom/TelecomUtil.java b/java/com/android/dialer/telecom/TelecomUtil.java
index 2608cb2aa..8c0090928 100644
--- a/java/com/android/dialer/telecom/TelecomUtil.java
+++ b/java/com/android/dialer/telecom/TelecomUtil.java
@@ -50,7 +50,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * perform the required check and return the fallback default if the permission is missing,
  * otherwise return the value from TelecomManager.
  */
-@SuppressWarnings("MissingPermission")
+@SuppressWarnings({"MissingPermission", "Guava"})
 public abstract class TelecomUtil {
 
   private static final String TAG = "TelecomUtil";
@@ -145,7 +145,8 @@ public abstract class TelecomUtil {
 
   public static List<PhoneAccountHandle> getCallCapablePhoneAccounts(Context context) {
     if (hasReadPhoneStatePermission(context)) {
-      return getTelecomManager(context).getCallCapablePhoneAccounts();
+      return Optional.fromNullable(getTelecomManager(context).getCallCapablePhoneAccounts())
+          .or(new ArrayList<>());
     }
     return new ArrayList<>();
   }
-- 
cgit v1.2.3


From f2d31a1706c188b5cc1e522f21adcb2a91c78a3d Mon Sep 17 00:00:00 2001
From: Android Dialer <noreply@google.com>
Date: Thu, 17 May 2018 20:21:39 -0700
Subject: Update spam blocking promotion wordings.

Bug: 79884797
Test: N/A
PiperOrigin-RevId: 197092298
Change-Id: I2f94f9a66a2530a5f2d0ad6630993a2e7b2b4bb8
---
 .../dialer/spam/promo/SpamBlockingPromoHelper.java |  4 +++
 .../res/drawable/spam_blocking_promo_icon.xml      | 34 ++++++++++++++++++++++
 .../dialer/spam/promo/res/values/strings.xml       |  7 +++--
 3 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 java/com/android/dialer/spam/promo/res/drawable/spam_blocking_promo_icon.xml

diff --git a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java
index e9f7cc6c1..c7bf53696 100644
--- a/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java
+++ b/java/com/android/dialer/spam/promo/SpamBlockingPromoHelper.java
@@ -23,6 +23,7 @@ import android.app.Notification.Builder;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.DialogInterface.OnDismissListener;
+import android.graphics.drawable.Icon;
 import android.support.design.widget.Snackbar;
 import android.support.v4.os.BuildCompat;
 import android.view.View;
@@ -179,6 +180,8 @@ public class SpamBlockingPromoHelper {
             .setPriority(Notification.PRIORITY_DEFAULT)
             .setColor(context.getColor(R.color.dialer_theme_color))
             .setSmallIcon(R.drawable.quantum_ic_call_vd_theme_24)
+            .setLargeIcon(Icon.createWithResource(context, R.drawable.spam_blocking_promo_icon))
+            .setContentText(context.getString(R.string.spam_blocking_promo_text))
             .setStyle(
                 new Notification.BigTextStyle()
                     .bigText(context.getString(R.string.spam_blocking_promo_text)))
@@ -196,3 +199,4 @@ public class SpamBlockingPromoHelper {
     return builder.build();
   }
 }
+
diff --git a/java/com/android/dialer/spam/promo/res/drawable/spam_blocking_promo_icon.xml b/java/com/android/dialer/spam/promo/res/drawable/spam_blocking_promo_icon.xml
new file mode 100644
index 000000000..9b35bcbc4
--- /dev/null
+++ b/java/com/android/dialer/spam/promo/res/drawable/spam_blocking_promo_icon.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2018 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
+  -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item>
+    <shape android:shape="oval">
+      <solid android:color="@color/incall_call_spam_background_color"/>
+      <size
+          android:height="@android:dimen/notification_large_icon_height"
+          android:width="@android:dimen/notification_large_icon_width"/>
+    </shape>
+  </item>
+
+  <item
+      android:drawable="@drawable/quantum_ic_report_white_36"
+      android:gravity="center"/>
+
+</layer-list>
diff --git a/java/com/android/dialer/spam/promo/res/values/strings.xml b/java/com/android/dialer/spam/promo/res/values/strings.xml
index 037e83b01..91036beec 100644
--- a/java/com/android/dialer/spam/promo/res/values/strings.xml
+++ b/java/com/android/dialer/spam/promo/res/values/strings.xml
@@ -17,9 +17,10 @@
 
 <resources>
   <!-- Title for the spam blocking promo dialog. [CHAR LIMIT=100] -->
-  <string name="spam_blocking_promo_title">Also filter suspected spam calls?</string>
-  <!-- Text for the spam blocking promo dialog. [CHAR LIMIT=100] -->
-  <string name="spam_blocking_promo_text">You won\'t be disturbed by incoming suspected spam calls</string>
+  <string name="spam_blocking_promo_title">Filter all suspected spam calls?</string>
+  <!-- Text for the spam blocking promo dialog. [CHAR LIMIT=NONE] -->
+  <string name="spam_blocking_promo_text">Calls like the one you just blocked will no longer
+      disturb you</string>
   <!-- Label for filter spam dialog action. [CHAR LIMIT=32] -->
   <string name="spam_blocking_promo_action_filter_spam">Filter Spam</string>
   <!-- Label for "Dismiss" dialog action. [CHAR LIMIT=32] -->
-- 
cgit v1.2.3