Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev (b439c837) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/quickstep/views/RecentsView.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -3166,6 +3166,8 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		InteractionJankMonitorWrapper.cancel(
		InteractionJankMonitorWrapper.CUJ_SPLIT_SCREEN_ENTER);
		}

		updateCurrentTaskActionsVisibility();
		});
		}

		@@ -4666,6 +4668,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		mSecondSplitHiddenView = null;
		}

		// We are leaving split selection state, so it is safe to reset thumbnail translations for
		// the next time split is invoked.
		setTaskViewsPrimarySplitTranslation(0);
		setTaskViewsSecondarySplitTranslation(0);

		if (mSplitHiddenTaskViewIndex == -1) {
		return;
		}
		@@ -4680,11 +4687,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		}
		onLayout(false /* changed */, getLeft(), getTop(), getRight(), getBottom());

		// We are leaving split selection state, so it is safe to reset thumbnail translations for
		// the next time split is invoked.
		setTaskViewsPrimarySplitTranslation(0);
		setTaskViewsSecondarySplitTranslation(0);

		resetTaskVisuals();
		mSplitHiddenTaskViewIndex = -1;
		if (mSplitHiddenTaskView != null) {