Merge "Apply/reset split scroll offset regardless of previous state" into sc-v2-dev (87f010f3) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -66,6 +66,12 @@ public final class RecentsViewStateController extends
		// In Overview, we may be layering app surfaces behind Launcher, so we need to notify
		// DepthController to prevent optimizations which might occlude the layers behind
		mLauncher.getDepthController().setHasContentBehindLauncher(state.overviewUi);

		if (isSplitSelectionState(state)) {
		mRecentsView.applySplitPrimaryScrollOffset();
		} else {
		mRecentsView.resetSplitPrimaryScrollOffset();
		}
		}

		@Override
		@@ -90,8 +96,10 @@ public final class RecentsViewStateController extends
		LauncherState currentState = mLauncher.getStateManager().getState();
		if (isSplitSelectionState(toState) && !isSplitSelectionState(currentState)) {
		builder.add(mRecentsView.createSplitSelectInitAnimation().buildAnim());
		}
		if (isSplitSelectionState(toState)) {
		mRecentsView.applySplitPrimaryScrollOffset();
		} else if (!isSplitSelectionState(toState) && isSplitSelectionState(currentState)) {
		} else {
		mRecentsView.resetSplitPrimaryScrollOffset();
		}