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

Commit bb154927 authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Close system dialogs before launching LongScreenshotsActivity" into tm-qpr-dev

parents aa820945 30731e72

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

+6 −2
Original line number Diff line number Diff line
@@ -739,10 +739,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.putExtra(LongScreenshotActivity.EXTRA_SCREENSHOT_USER_HANDLE,

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

+1 −0
Original line number Diff line number Diff line
@@ -898,6 +898,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);