diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-25 07:46:05 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-25 07:46:05 +0000 |
commit | 075d002d9647b2a67219458849e375661f60eeb0 (patch) | |
tree | 77f40070011a8d852ae7e03959acdcade1691871 | |
parent | 2efebf829d6391eb9fa2c93f9bd1dbd1ab3cfe9b (diff) | |
parent | 460e0347bf5add297d8d9de8a520787e4b3fe2d2 (diff) | |
download | packages_apps_Contacts-075d002d9647b2a67219458849e375661f60eeb0.tar.gz packages_apps_Contacts-075d002d9647b2a67219458849e375661f60eeb0.tar.bz2 packages_apps_Contacts-075d002d9647b2a67219458849e375661f60eeb0.zip |
release-request-c5216b17-dc50-4b24-831c-dc696ed657cc-for-git_oc-dr1-release-4133426 snap-temp-L83500000077479774
Change-Id: Ic118baef08c8451f3c58ddb16c1017524ed870e9
-rw-r--r-- | src/com/android/contacts/vcard/NotificationImportExportListener.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/com/android/contacts/vcard/NotificationImportExportListener.java b/src/com/android/contacts/vcard/NotificationImportExportListener.java index 46a33651c..beabe26bc 100644 --- a/src/com/android/contacts/vcard/NotificationImportExportListener.java +++ b/src/com/android/contacts/vcard/NotificationImportExportListener.java @@ -220,7 +220,7 @@ public class NotificationImportExportListener implements VCardImportExportListen final NotificationCompat.Builder builder = new NotificationCompat.Builder(context); builder.setOngoing(true) - .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) + .setChannelId(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) .setOnlyAlertOnce(true) .setProgress(totalCount, currentCount, totalCount == - 1) .setTicker(tickerText) @@ -235,7 +235,7 @@ public class NotificationImportExportListener implements VCardImportExportListen NumberFormat.getPercentInstance().format((double) currentCount / totalCount); builder.setContentText(percentage); } - return builder.getNotification(); + return builder.build(); } /** @@ -247,8 +247,8 @@ public class NotificationImportExportListener implements VCardImportExportListen /* package */ static Notification constructCancelNotification( Context context, String description) { ContactsNotificationChannelsUtil.createDefaultChannel(context); - return new NotificationCompat.Builder(context) - .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) + return new NotificationCompat.Builder(context, + ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) .setAutoCancel(true) .setSmallIcon(android.R.drawable.stat_notify_error) .setColor(context.getResources().getColor(R.color.dialtacts_theme_color)) @@ -258,7 +258,7 @@ public class NotificationImportExportListener implements VCardImportExportListen // app to make sure that no other app can steal this pending-intent b/19296918. .setContentIntent(PendingIntent .getActivity(context, 0, new Intent(context.getPackageName(), null), 0)) - .getNotification(); + .build(); } /** @@ -279,8 +279,8 @@ public class NotificationImportExportListener implements VCardImportExportListen /* package */ static Notification constructFinishNotificationWithFlags( Context context, String title, String description, Intent intent, int flags) { ContactsNotificationChannelsUtil.createDefaultChannel(context); - return new NotificationCompat.Builder(context) - .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) + return new NotificationCompat.Builder(context, + ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) .setAutoCancel(true) .setColor(context.getResources().getColor(R.color.dialtacts_theme_color)) .setSmallIcon(R.drawable.quantum_ic_done_vd_theme_24) @@ -292,7 +292,7 @@ public class NotificationImportExportListener implements VCardImportExportListen .setContentIntent(PendingIntent.getActivity(context, 0, (intent != null ? intent : new Intent(context.getPackageName(), null)), flags)) - .getNotification(); + .build(); } /** @@ -304,8 +304,8 @@ public class NotificationImportExportListener implements VCardImportExportListen /* package */ static Notification constructImportFailureNotification( Context context, String reason) { ContactsNotificationChannelsUtil.createDefaultChannel(context); - return new NotificationCompat.Builder(context) - .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) + return new NotificationCompat.Builder(context, + ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) .setAutoCancel(true) .setColor(context.getResources().getColor(R.color.dialtacts_theme_color)) .setSmallIcon(android.R.drawable.stat_notify_error) @@ -315,6 +315,6 @@ public class NotificationImportExportListener implements VCardImportExportListen // app to make sure that no other app can steal this pending-intent b/19296918. .setContentIntent(PendingIntent .getActivity(context, 0, new Intent(context.getPackageName(), null), 0)) - .getNotification(); + .build(); } } |