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

Commit dc30c8fc authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Small fixes to screenshot->long screenshot transition" into sc-dev

parents 974d845c d148ef32

packages/SystemUI/res/layout/long_screenshot.xml

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:scaleType="matrix"

        android:visibility="invisible"

        app:layout_constraintTop_toTopOf="@id/preview"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

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

+0 −2
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ public class LongScreenshotActivity extends Activity { 
                        / (float) mLongScreenshot.getHeight());



        mEnterTransitionView.setImageDrawable(drawable);



        mEnterTransitionView.getViewTreeObserver().addOnPreDrawListener(

                new ViewTreeObserver.OnPreDrawListener() {

                    @Override
@@ -220,7 +219,6 @@ public class LongScreenshotActivity extends Activity { 
                                        mCropView.animateEntrance();

                                        mCropView.setVisibility(View.VISIBLE);

                                        setButtonsEnabled(true);

                                        mEnterTransitionView.setVisibility(View.GONE);

                                    });

                        });

                        return true;

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

+2 −6
Original line number Diff line number Diff line
@@ -690,12 +690,8 @@ public class ScreenshotController { 
                        intent.setFlags(

                                Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);



                        Pair<ActivityOptions, ExitTransitionCoordinator> transition =

                                ActivityOptions.startSharedElementAnimation(mWindow,

                                        new ScreenshotExitTransitionCallbacksSupplier(false).get(),

                                        null);

                        transition.second.startExit();

                        mContext.startActivity(intent, transition.first.toBundle());

                        mContext.startActivity(intent,

                                ActivityOptions.makeCustomAnimation(mContext, 0, 0).toBundle());

                        RemoteAnimationAdapter runner = new RemoteAnimationAdapter(

                                SCREENSHOT_REMOTE_RUNNER, 0, 0);

                        try {