Merge "Fix input pause without resume." into mnc-dev (503ad9ee) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityTransitionCoordinator.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -217,11 +217,6 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
		}

		protected void viewsReady(ArrayMap<String, View> sharedElements) {
		final View decor = getDecor();
		final ViewRootImpl viewRoot = decor == null ? null : decor.getViewRootImpl();
		if (viewRoot != null) {
		viewRoot.setPausedForTransition(true);
		}
		sharedElements.retainAll(mAllSharedElementNames);
		if (mListener != null) {
		mListener.onMapSharedElements(mAllSharedElementNames, sharedElements);
		@@ -905,6 +900,14 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver {
		}
		}

		protected void pauseInput() {
		final View decor = getDecor();
		final ViewRootImpl viewRoot = decor == null ? null : decor.getViewRootImpl();
		if (viewRoot != null) {
		viewRoot.setPausedForTransition(true);
		}
		}

		protected void onTransitionsComplete() {}

		protected class ContinueTransitionListener extends Transition.TransitionListenerAdapter {

+1 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
		boolean startSharedElementTransition = true;
		setGhostVisibility(View.INVISIBLE);
		scheduleGhostVisibilityChange(View.INVISIBLE);
		pauseInput();
		Transition transition = beginTransition(decorView, startEnterTransition,
		startSharedElementTransition);
		scheduleGhostVisibilityChange(View.VISIBLE);

+2 −0

Original line number	Diff line number	Diff line
		@@ -203,6 +203,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
		public void startExit() {
		if (!mIsExitStarted) {
		mIsExitStarted = true;
		pauseInput();
		ViewGroup decorView = getDecor();
		if (decorView != null) {
		decorView.suppressLayout(true);
		@@ -220,6 +221,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
		public void startExit(int resultCode, Intent data) {
		if (!mIsExitStarted) {
		mIsExitStarted = true;
		pauseInput();
		ViewGroup decorView = getDecor();
		if (decorView != null) {
		decorView.suppressLayout(true);