From 5cfa2c31a9877563a383c3c6ee10790af9db61d0 Mon Sep 17 00:00:00 2001 From: Nancy Chen Date: Wed, 13 Jan 2016 11:47:46 -0800 Subject: Use telephony voicemail notification settings for vvm. Previously visual voicemail notifications did not align with the telephony voicemail notification settings that the user could visit through dialer settings. After adding an API to access those telephony settings, dialer can now read those settings and use them when providing notifications for visual voicemail. Bug: 24164917 Change-Id: I3e8335be7fa1d265616818a6543bfe9242104560 --- .../dialer/calllog/DefaultVoicemailNotifier.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java index 2b894a12d..13ec0292a 100644 --- a/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java +++ b/src/com/android/dialer/calllog/DefaultVoicemailNotifier.java @@ -24,6 +24,7 @@ import com.google.common.collect.Maps; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; +import android.content.ComponentName; import android.content.ContentResolver; import android.content.ContentUris; import android.content.Context; @@ -33,7 +34,9 @@ import android.database.Cursor; import android.net.Uri; import android.provider.CallLog.Calls; import android.provider.ContactsContract.PhoneLookup; +import android.telecom.PhoneAccountHandle; import android.telephony.PhoneNumberUtils; +import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; @@ -194,13 +197,24 @@ public class DefaultVoicemailNotifier { // TODO: Use the photo of contact if all calls are from the same person. final int icon = android.R.drawable.stat_notify_voicemail; + Uri ringtoneUri = null; + boolean shouldVibrate = callToNotify != null; + if (callToNotify != null) { + PhoneAccountHandle accountHandle = new PhoneAccountHandle( + ComponentName.unflattenFromString(callToNotify.accountComponentName), + callToNotify.accountId); + ringtoneUri = getTelephonyManager().getVoicemailRingtoneUri(accountHandle); + shouldVibrate = getTelephonyManager().isVoicemailVibrationEnabled(accountHandle); + } + Notification.Builder notificationBuilder = new Notification.Builder(mContext) .setSmallIcon(icon) .setContentTitle(title) .setContentText(callers) .setStyle(new Notification.BigTextStyle().bigText(transcription)) + .setSound(ringtoneUri) .setColor(resources.getColor(R.color.dialer_theme_color)) - .setDefaults(callToNotify != null ? Notification.DEFAULT_ALL : 0) + .setDefaults(shouldVibrate ? Notification.DEFAULT_VIBRATE : 0) .setDeleteIntent(createMarkNewVoicemailsAsOldIntent()) .setAutoCancel(true); @@ -224,6 +238,10 @@ public class DefaultVoicemailNotifier { mNotificationManager.notify(NOTIFICATION_TAG, NOTIFICATION_ID, notificationBuilder.build()); } + private TelephonyManager getTelephonyManager() { + return (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE); + } + /** Creates a pending intent that marks all new voicemails as old. */ private PendingIntent createMarkNewVoicemailsAsOldIntent() { Intent intent = new Intent(mContext, CallLogNotificationsService.class); -- cgit v1.2.3