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

Commit 723a3aed authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Close system dialogs before launching LongScreenshotsActivity" into... 

Merge "Close system dialogs before launching LongScreenshotsActivity" into tm-qpr-dev am: bb154927 am: 9a342603

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



Change-Id: I4c743a169d425ef72c8e70b25c75f450e06b012e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents adc53582 9a342603

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);