Merge "Fix no transition when only shared element exists." into lmp-dev (71d34ec5) · Commits · e / os / android_frameworks_base

core/java/android/app/ExitTransitionCoordinator.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -136,10 +136,11 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
		Transition transition = getSharedElementExitTransition();
		final ArrayList<View> sharedElementSnapshots = createSnapshots(mExitSharedElementBundle,
		mSharedElementNames);
		transition.addListener(new Transition.TransitionListenerAdapter() {
		transition.addListener(new ContinueTransitionListener() {
		@Override
		public void onTransitionEnd(Transition transition) {
		transition.removeListener(this);
		super.onTransitionEnd(transition);
		int count = mSharedElements.size();
		for (int i = 0; i < count; i++) {
		View sharedElement = mSharedElements.get(i);
		@@ -221,6 +222,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
		if (transition != null) {
		TransitionManager.beginDelayedTransition(getDecor(), transition);
		mTransitioningViews.get(0).invalidate();
		} else {
		transitionStarted();
		}
		}

		@@ -307,6 +310,8 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
		if (transition != null) {
		TransitionManager.beginDelayedTransition(getDecor(), transition);
		getDecor().invalidate();
		} else {
		transitionStarted();
		}
		}