diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-27 06:00:51 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-27 06:00:51 +0000 |
| commit | 9611d985bad2dddbbbe5973e572187b586cc9b60 (patch) | |
| tree | d69536c095fa4e2a04af788a75d486c3f484afd5 | |
| parent | 741e826b8842cd018f666c5ebb41160c84a4eeda (diff) | |
| parent | 661d1c256153e9c4e3efc200ee51d96440cffc2b (diff) | |
| download | packages_apps_Contacts-9611d985bad2dddbbbe5973e572187b586cc9b60.tar.gz packages_apps_Contacts-9611d985bad2dddbbbe5973e572187b586cc9b60.tar.bz2 packages_apps_Contacts-9611d985bad2dddbbbe5973e572187b586cc9b60.zip | |
Merge cherrypicks of [2463695, 2463745, 2463732, 2463679, 2463844, 2463803, 2463746, 2463616, 2463786, 2463747, 2463881, 2463733, 2463804, 2463863, 2463787] into oc-release
Change-Id: I4636c2224c8f0ac18a9ea24104fb142a525aaf72
| -rw-r--r-- | src/com/android/contacts/SimImportService.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/contacts/SimImportService.java b/src/com/android/contacts/SimImportService.java index 60de982b6..1e41af005 100644 --- a/src/com/android/contacts/SimImportService.java +++ b/src/com/android/contacts/SimImportService.java @@ -189,9 +189,9 @@ public class SimImportService extends Service { private Notification getCompletedNotification() { final Intent intent = new Intent(this, PeopleActivity.class); - final NotificationCompat.Builder builder = new NotificationCompat.Builder(this); + final NotificationCompat.Builder builder = new NotificationCompat.Builder( + this, ContactsNotificationChannelsUtil.DEFAULT_CHANNEL); builder.setOngoing(false) - .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) .setAutoCancel(true) .setContentTitle(this.getString(R.string.importing_sim_finished_title)) .setColor(this.getResources().getColor(R.color.dialtacts_theme_color)) @@ -202,9 +202,9 @@ public class SimImportService extends Service { private Notification getFailedNotification() { final Intent intent = new Intent(this, PeopleActivity.class); - final NotificationCompat.Builder builder = new NotificationCompat.Builder(this); + final NotificationCompat.Builder builder = new NotificationCompat.Builder( + this, ContactsNotificationChannelsUtil.DEFAULT_CHANNEL); builder.setOngoing(false) - .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) .setAutoCancel(true) .setContentTitle(this.getString(R.string.importing_sim_failed_title)) .setContentText(this.getString(R.string.importing_sim_failed_message)) @@ -215,10 +215,10 @@ public class SimImportService extends Service { } private Notification getImportingNotification() { - final NotificationCompat.Builder builder = new NotificationCompat.Builder(this); + final NotificationCompat.Builder builder = new NotificationCompat.Builder( + this, ContactsNotificationChannelsUtil.DEFAULT_CHANNEL); final String description = getString(R.string.importing_sim_in_progress_title); builder.setOngoing(true) - .setChannel(ContactsNotificationChannelsUtil.DEFAULT_CHANNEL) .setProgress(/* current */ 0, /* max */ 100, /* indeterminate */ true) .setContentTitle(description) .setColor(this.getResources().getColor(R.color.dialtacts_theme_color)) |