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

Commit ee28e9e1 authored by Alison Cichowlas's avatar Alison Cichowlas Committed by android-build-merger
Browse files

Merge "Screenshots: delete, default for edit intent." into pi-dev 

am: b16f1f04

Change-Id: I39734a647b16fcbbe9a9980237bcbdfa37b4f87d
parents b3292b07 b16f1f04

packages/SystemUI/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -482,4 +482,10 @@ 
    <!-- Smart replies in notifications: Maximum number of times SmartReplyView will try to find a

         better (narrower) line-break for a double-line smart reply button. -->

    <integer name="config_smart_replies_in_notifications_max_squeeze_remeasure_attempts">3</integer>



    <!-- Screenshot editing default activity.  Must handle ACTION_EDIT image/png intents.

         Blank sends the user to the Chooser first.

         This name is in the ComponentName flattened format (package/class)  -->

    <string name="config_screenshotEditor" translatable="false"></string>



</resources>

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

+33 −8
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.app.Notification.BigPictureStyle; 
import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.ContentValues;

import android.content.Context;
@@ -57,6 +58,7 @@ import android.os.RemoteException; 
import android.os.UserHandle;

import android.provider.MediaStore;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.Slog;

import android.view.Display;

import android.view.LayoutInflater;
@@ -322,6 +324,17 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
                    r.getString(com.android.internal.R.string.screenshot_edit), editAction);

            mNotificationBuilder.addAction(editActionBuilder.build());





            // Create a delete action for the notification

            PendingIntent deleteAction = PendingIntent.getBroadcast(context, 0,

                    new Intent(context, GlobalScreenshot.DeleteScreenshotReceiver.class)

                            .putExtra(GlobalScreenshot.SCREENSHOT_URI_ID, uri.toString()),

                    PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);

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

                    R.drawable.ic_screenshot_delete,

                    r.getString(com.android.internal.R.string.delete), deleteAction);

            mNotificationBuilder.addAction(deleteActionBuilder.build());



            mParams.imageUri = uri;

            mParams.image = null;

            mParams.errorMsgResId = 0;
@@ -895,17 +908,29 @@ class GlobalScreenshot { 
            } catch (RemoteException e) {

            }



            Intent sharingIntent = intent.getParcelableExtra(SHARING_INTENT);

            Intent actionIntent = intent.getParcelableExtra(SHARING_INTENT);



            // If this is an edit & default editor exists, route straight there.

            String editorPackage = context.getResources().getString(R.string.config_screenshotEditor);

            if (actionIntent.getAction() == Intent.ACTION_EDIT &&

                    editorPackage != null && editorPackage.length() > 0) {

                actionIntent.setComponent(ComponentName.unflattenFromString(editorPackage));

                final NotificationManager nm =

                        (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

                nm.cancel(SystemMessage.NOTE_GLOBAL_SCREENSHOT);

            } else {

                PendingIntent chooseAction = PendingIntent.getBroadcast(context, 0,

                        new Intent(context, GlobalScreenshot.TargetChosenReceiver.class),

                        PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_ONE_SHOT);

            Intent chooserIntent = Intent.createChooser(sharingIntent, null,

                actionIntent = Intent.createChooser(actionIntent, null,

                        chooseAction.getIntentSender())

                        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);

            }



            ActivityOptions opts = ActivityOptions.makeBasic();

            opts.setDisallowEnterPictureInPictureWhileLaunching(true);

            context.startActivityAsUser(chooserIntent, opts.toBundle(), UserHandle.CURRENT);



            context.startActivityAsUser(actionIntent, opts.toBundle(), UserHandle.CURRENT);

        }

    }