Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9611d985 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2463695, 2463745, 2463732, 2463679, 2463844, 2463803,... 

Merge cherrypicks of [2463695, 2463745, 2463732, 2463679, 2463844, 2463803, 2463746, 2463616, 2463786, 2463747, 2463881, 2463733, 2463804, 2463863, 2463787] into oc-release

Change-Id: I4636c2224c8f0ac18a9ea24104fb142a525aaf72
parents 741e826b 661d1c25

src/com/android/contacts/SimImportService.java

+6 −6
Original line number Diff line number Diff line
@@ -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))