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

Commit a917d708 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug in which some Views were not executing enter transition."

parents 89aa8b92 aae763e6

core/java/android/app/ActivityTransitionCoordinator.java

+9 −1
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
    private ArrayList<Matrix> mSharedElementParentMatrices;

    private boolean mSharedElementTransitionComplete;

    private boolean mViewsTransitionComplete;

    private ArrayList<View> mStrippedTransitioningViews = new ArrayList<>();



    public ActivityTransitionCoordinator(Window window,

            ArrayList<String> allSharedElementNames,
@@ -287,7 +288,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
            View view = mTransitioningViews.get(i);

            if (!view.getGlobalVisibleRect(r)) {

                mTransitioningViews.remove(i);

                showView(view, true);

                mStrippedTransitioningViews.add(view);

            }

        }

    }
@@ -360,6 +361,12 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
                }

            }

        }

        if (mStrippedTransitioningViews != null) {

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

                View view = mStrippedTransitioningViews.get(i);

                set.excludeTarget(view, true);

            }

        }

        // By adding the transition after addTarget, we prevent addTarget from

        // affecting transition.

        set.addTransition(transition);
@@ -679,6 +686,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
        mWindow = null;

        mSharedElements.clear();

        mTransitioningViews = null;

        mStrippedTransitioningViews = null;

        mOriginalAlphas.clear();

        mResultReceiver = null;

        mPendingTransition = null;

core/java/android/app/EnterTransitionCoordinator.java

+1 −3
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
        mIsReadyForTransition = true;

        hideViews(mSharedElements);

        if (getViewsTransition() != null && mTransitioningViews != null) {

            stripOffscreenViews();

            hideViews(mTransitioningViews);

        }

        if (mIsReturning) {
@@ -518,9 +519,6 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
            mIsViewsTransitionStarted = true;

            if (mTransitioningViews != null && !mTransitioningViews.isEmpty()) {

                viewsTransition = configureTransition(getViewsTransition(), true);

                if (viewsTransition != null && !mIsReturning) {

                    stripOffscreenViews();

                }

            }

            if (viewsTransition == null) {

                viewsTransitionComplete();