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

Commit 394cbeea authored by Mark Renouf's avatar Mark Renouf Committed by Automerger Merge Worker
Browse files

Merge "Skip shared element transition for implicit intent" into udc-dev am:... 

Merge "Skip shared element transition for implicit intent" into udc-dev am: 05a834b1 am: 12898fbf

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



Change-Id: I6e5a984c1eec5cf6f9adb939ace82a387fd155ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c76ee3c6 12898fbf

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

+14 −12
Original line number Diff line number Diff line
@@ -343,22 +343,24 @@ public class LongScreenshotActivity extends Activity { 
        } else {

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

            Intent intent = new Intent(Intent.ACTION_EDIT);

            if (!TextUtils.isEmpty(editorPackage)) {

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

            }

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

            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION

                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);

            Bundle options = null;



            // Skip shared element transition for implicit edit intents

            if (!TextUtils.isEmpty(editorPackage)) {

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

                mTransitionView.setImageBitmap(mOutputBitmap);

                mTransitionView.setVisibility(View.VISIBLE);

                mTransitionView.setTransitionName(

                        ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME);

                options = ActivityOptions.makeSceneTransitionAnimation(this, mTransitionView,

                        ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME).toBundle();

                // TODO: listen for transition completing instead of finishing onStop

                mTransitionStarted = true;

            startActivity(intent,

                    ActivityOptions.makeSceneTransitionAnimation(this, mTransitionView,

                            ChooserActivity.FIRST_IMAGE_PREVIEW_TRANSITION_NAME).toBundle());

            }

            startActivity(intent, options);

        }

    }