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

Commit 6c88b5be authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Use notification action to stop recording" into sc-dev am: e9408eaf 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15082881

Change-Id: Ibf39f07b0042f1a7756828da32bc7edf88b40351
parents 8624f6b7 e9408eaf

packages/SystemUI/src/com/android/systemui/screenrecord/RecordingService.java

+10 −5
Original line number Diff line number Diff line
@@ -291,19 +291,24 @@ public class RecordingService extends Service implements MediaRecorder.OnInfoLis 
                ? res.getString(R.string.screenrecord_ongoing_screen_only)

                : res.getString(R.string.screenrecord_ongoing_screen_and_audio);



        Intent stopIntent = getNotificationIntent(this);

        PendingIntent pendingIntent = PendingIntent.getService(

                this,

                REQUEST_CODE,

                getNotificationIntent(this),

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

        Notification.Action stopAction = new Notification.Action.Builder(

                Icon.createWithResource(this, R.drawable.ic_android),

                getResources().getString(R.string.screenrecord_stop_label),

                pendingIntent).build();

        Notification.Builder builder = new Notification.Builder(this, CHANNEL_ID)

                .setSmallIcon(R.drawable.ic_screenrecord)

                .setContentTitle(notificationTitle)

                .setContentText(getResources().getString(R.string.screenrecord_stop_text))

                .setUsesChronometer(true)

                .setColorized(true)

                .setColor(getResources().getColor(R.color.GM2_red_700))

                .setOngoing(true)

                .setForegroundServiceBehavior(Notification.FOREGROUND_SERVICE_IMMEDIATE)

                .setContentIntent(

                        PendingIntent.getService(this, REQUEST_CODE, stopIntent,

                                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE))

                .addAction(stopAction)

                .addExtras(extras);

        startForeground(NOTIFICATION_RECORDING_ID, builder.build());

    }