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

Commit 25a92a3d authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Broadcast screenshot intents in the foreground"

parents fe348ebe ffb18977

packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java

+9 −6
Original line number Diff line number Diff line
@@ -281,7 +281,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
                        .putExtra(GlobalScreenshot.EXTRA_ID, mScreenshotId)

                        .putExtra(GlobalScreenshot.EXTRA_SMART_ACTIONS_ENABLED,

                                mSmartActionsEnabled)

                        .setAction(Intent.ACTION_SEND),

                        .setAction(Intent.ACTION_SEND)

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                PendingIntent.FLAG_CANCEL_CURRENT, UserHandle.SYSTEM);



        Notification.Action.Builder shareActionBuilder = new Notification.Action.Builder(
@@ -310,7 +311,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
                        .putExtra(GlobalScreenshot.EXTRA_ID, mScreenshotId)

                        .putExtra(GlobalScreenshot.EXTRA_SMART_ACTIONS_ENABLED,

                                mSmartActionsEnabled)

                        .setAction(Intent.ACTION_EDIT),

                        .setAction(Intent.ACTION_EDIT)

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                PendingIntent.FLAG_CANCEL_CURRENT, UserHandle.SYSTEM);

        Notification.Action.Builder editActionBuilder = new Notification.Action.Builder(

                Icon.createWithResource(r, R.drawable.ic_screenshot_edit),
@@ -324,7 +326,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
                            .putExtra(GlobalScreenshot.SCREENSHOT_URI_ID, uri.toString())

                            .putExtra(GlobalScreenshot.EXTRA_ID, mScreenshotId)

                            .putExtra(GlobalScreenshot.EXTRA_SMART_ACTIONS_ENABLED,

                                    mSmartActionsEnabled),

                                    mSmartActionsEnabled)

                            .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                    PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);

            Notification.Action.Builder deleteActionBuilder = new Notification.Action.Builder(

                    Icon.createWithResource(r, R.drawable.ic_screenshot_delete),
@@ -361,9 +364,9 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
            String actionType = extras.getString(

                    ScreenshotNotificationSmartActionsProvider.ACTION_TYPE,

                    ScreenshotNotificationSmartActionsProvider.DEFAULT_ACTION_TYPE);

            Intent intent = new Intent(context,

                    GlobalScreenshot.SmartActionsReceiver.class).putExtra(

                    GlobalScreenshot.EXTRA_ACTION_INTENT, action.actionIntent);

            Intent intent = new Intent(context, GlobalScreenshot.SmartActionsReceiver.class)

                    .putExtra(GlobalScreenshot.EXTRA_ACTION_INTENT, action.actionIntent)

                    .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);

            addIntentExtras(mScreenshotId, intent, actionType, mSmartActionsEnabled);

            PendingIntent broadcastIntent = PendingIntent.getBroadcast(context,

                    mRandom.nextInt(),