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

Commit 566cbf20 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Fix activity transitions enter transition."

parents 2eb983be 60625b02

core/java/android/app/ActivityTransitionCoordinator.java

+10 −7
Original line number Diff line number Diff line
@@ -218,6 +218,11 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
        if (getViewsTransition() != null) {

            getDecor().captureTransitioningViews(mTransitioningViews);

            mTransitioningViews.removeAll(mSharedElements);

        }

        setEpicenter();

    }



    protected void stripOffscreenViews() {

        Rect r = new Rect();

        for (int i = mTransitioningViews.size() - 1; i >= 0; i--) {

            View view = mTransitioningViews.get(i);
@@ -226,8 +231,6 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
            }

        }

    }

        setEpicenter();

    }



    protected Window getWindow() {

        return mWindow;

core/java/android/app/EnterTransitionCoordinator.java

+11 −1
Original line number Diff line number Diff line
@@ -286,6 +286,13 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
        mResultReceiver = null; // all done sending messages.

    }



    @Override

    protected void stripOffscreenViews() {

        setViewVisibility(mTransitioningViews, View.VISIBLE);

        super.stripOffscreenViews();

        setViewVisibility(mTransitioningViews, View.INVISIBLE);

    }



    private void onTakeSharedElements() {

        if (!mIsReadyForTransition || mSharedElementsBundle == null) {

            return;
@@ -325,8 +332,11 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
        Transition viewsTransition = null;

        if (startEnterTransition && !mTransitioningViews.isEmpty()) {

            viewsTransition = configureTransition(getViewsTransition());

            if (viewsTransition != null) {

                stripOffscreenViews();

                viewsTransition = addTargets(viewsTransition, mTransitioningViews);

            }

        }



        Transition transition = mergeTransitions(sharedElementTransition, viewsTransition);

        if (startSharedElementTransition) {

core/java/android/app/ExitTransitionCoordinator.java

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
        super(activity.getWindow(), names, getListener(activity, isReturning),

                isReturning);

        viewsReady(mapSharedElements(accepted, mapped));

        stripOffscreenViews();

        mIsBackgroundReady = !isReturning;

        mActivity = activity;

    }