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

Commit c2fd9cce authored by mrenouf's avatar mrenouf Committed by Automerger Merge Worker
Browse files

Merge "Fix edit button in screenshot share activity" am: d7013fb9 am:... 

Merge "Fix edit button in screenshot share activity" am: d7013fb9 am: c6158cc8 am: e50de70f am: f0f06ed2

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



Change-Id: I419311c32f6d92fca75f3c6b0837967a1142c957
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d7eb8172 f0f06ed2

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -237,7 +237,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
            String subjectDate = DateFormat.getDateTimeInstance().format(new Date(mImageTime));

            String subjectDate = DateFormat.getDateTimeInstance().format(new Date(mImageTime));

            String subject = String.format(SCREENSHOT_SHARE_SUBJECT_TEMPLATE, subjectDate);

            String subject = String.format(SCREENSHOT_SHARE_SUBJECT_TEMPLATE, subjectDate);

            Intent sharingIntent = new Intent(Intent.ACTION_SEND);

            Intent sharingIntent = new Intent(Intent.ACTION_SEND);

            sharingIntent.setType("image/png");

            sharingIntent.setDataAndType(uri, "image/png");

            sharingIntent.putExtra(Intent.EXTRA_STREAM, uri);

            sharingIntent.putExtra(Intent.EXTRA_STREAM, uri);

            // Include URI in ClipData also, so that grantPermission picks it up.

            // Include URI in ClipData also, so that grantPermission picks it up.

            // We don't use setData here because some apps interpret this as "to:".

            // We don't use setData here because some apps interpret this as "to:".