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

Commit 30731e72 authored by Matt Casey's avatar Matt Casey
Browse files

Close system dialogs before launching LongScreenshotsActivity 

In rare cases they may be blocking the shared element transition.

Bug: 241048682
Test: Manual reproduction of bug (long screenshot of quick actions edit
      screen)
Change-Id: I069c8fb55a17ac456c7ced795ab4a23856eb9cda
parent 693d0a41

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

+6 −2
Original line number Diff line number Diff line
@@ -728,10 +728,14 @@ public class ScreenshotController { 


            mLongScreenshotHolder.setLongScreenshot(longScreenshot);

            mLongScreenshotHolder.setTransitionDestinationCallback(

                    (transitionDestination, onTransitionEnd) ->

                    (transitionDestination, onTransitionEnd) -> {

                            mScreenshotView.startLongScreenshotTransition(

                                    transitionDestination, onTransitionEnd,

                                    longScreenshot));

                                    longScreenshot);

                        // TODO: Do this via ActionIntentExecutor instead.

                        mContext.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));

                    }

            );



            final Intent intent = new Intent(mContext, LongScreenshotActivity.class);

            intent.setFlags(

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

+1 −0
Original line number Diff line number Diff line
@@ -872,6 +872,7 @@ public class ScreenshotView extends FrameLayout implements 


    void startLongScreenshotTransition(Rect destination, Runnable onTransitionEnd,

            ScrollCaptureController.LongScreenshot longScreenshot) {

        mPendingSharedTransition = true;

        AnimatorSet animSet = new AnimatorSet();



        ValueAnimator scrimAnim = ValueAnimator.ofFloat(0, 1);