Merge "Fix public variables to not have 'm' prefix" into sc-v2-dev (f1aa726e) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/src/com/android/launcher3/uioverrides/states/SplitScreenSelectState.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ public class SplitScreenSelectState extends OverviewState {
		public float getSplitSelectTranslation(Launcher launcher) {
		RecentsView recentsView = launcher.getOverviewPanel();
		int splitPosition = recentsView.getSplitPlaceholder()
		.getActiveSplitPositionOption().mStagePosition;
		.getActiveSplitPositionOption().stagePosition;
		if (!recentsView.shouldShiftThumbnailsForSplitSelect(splitPosition)) {
		return 0f;
		}

quickstep/src/com/android/quickstep/TaskShortcutFactory.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ public interface TaskShortcutFactory {
		private SplitPositionOption mSplitPositionOption;
		public SplitSelectSystemShortcut(BaseDraggingActivity target, TaskView taskView,
		SplitPositionOption option) {
		super(option.mIconResId, option.mTextResId, target, taskView.getItemInfo());
		super(option.iconResId, option.textResId, target, taskView.getItemInfo());
		mTaskView = taskView;
		mSplitPositionOption = option;
		setEnabled(taskView.getRecentsView().getTaskViewCount() > 1);

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ public class SplitSelectStateController {
		mSecondTaskView = taskView;
		// Assume initial task is for top/left part of screen

		final int[] taskIds = mInitialPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT
		final int[] taskIds = mInitialPosition.stagePosition == STAGE_POSITION_TOP_OR_LEFT
		? new int[]{mInitialTaskView.getTask().key.id, taskView.getTask().key.id}
		: new int[]{taskView.getTask().key.id, mInitialTaskView.getTask().key.id};
		if (TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
		@@ -113,7 +113,7 @@ public class SplitSelectStateController {
		DeviceProfile deviceProfile) {
		InsettableFrameLayout.LayoutParams params =
		new InsettableFrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
		boolean topLeftPosition = mInitialPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT;
		boolean topLeftPosition = mInitialPosition.stagePosition == STAGE_POSITION_TOP_OR_LEFT;
		if (deviceProfile.isLandscape) {
		params.width = (int) resources.getDimension(R.dimen.split_placeholder_size);
		params.gravity = topLeftPosition ? Gravity.START : Gravity.END;

quickstep/src/com/android/quickstep/util/TaskViewSimulator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ public class TaskViewSimulator implements TransformParams.BuilderProxy {
		mStagePosition = STAGE_POSITION_UNDEFINED;
		return;
		}
		mStagePosition = mThumbnailPosition.equals(splitInfo.mLeftTopBounds) ?
		mStagePosition = mThumbnailPosition.equals(splitInfo.leftTopBounds) ?
		STAGE_POSITION_TOP_OR_LEFT :
		STAGE_POSITION_BOTTOM_OR_RIGHT;
		}

src/com/android/launcher3/touch/LandscapePagedViewHandler.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -169,12 +169,12 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
		DeviceProfile dp) {
		// Don't use device profile here because we know we're in fake landscape, only split option
		// available is top/left
		if (splitPosition.mStagePosition == STAGE_POSITION_TOP_OR_LEFT) {
		if (splitPosition.stagePosition == STAGE_POSITION_TOP_OR_LEFT) {
		// Top (visually left) side
		return SPLIT_TRANSLATE_PRIMARY_NEGATIVE;
		}
		throw new IllegalStateException("Invalid split stage position: " +
		splitPosition.mStagePosition);
		splitPosition.stagePosition);
		}

		@Override
		@@ -389,10 +389,10 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
		SplitConfigurationOptions.StagedSplitBounds splitInfo, int desiredStagePosition) {
		float diff;
		if (desiredStagePosition == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) {
		diff = outRect.height() * (1f - splitInfo.mLeftTaskPercent);
		diff = outRect.height() * (1f - splitInfo.leftTaskPercent);
		outRect.bottom -= diff;
		} else {
		diff = outRect.height() * splitInfo.mLeftTaskPercent;
		diff = outRect.height() * splitInfo.leftTaskPercent;
		outRect.top += diff;
		}
		}
		@@ -402,7 +402,7 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
		SplitConfigurationOptions.StagedSplitBounds splitInfo, int desiredStagePosition) {
		if (desiredStagePosition == STAGE_POSITION_BOTTOM_OR_RIGHT) {
		// The preview set is for the bottom/right, inset by top/left task
		splitOffset.x = splitInfo.mLeftTopBounds.width() + splitInfo.mDividerBounds.width() / 2;
		splitOffset.x = splitInfo.leftTopBounds.width() + splitInfo.dividerBounds.width() / 2;
		}
		}

		@@ -413,12 +413,12 @@ public class LandscapePagedViewHandler implements PagedOrientationHandler {
		int spaceAboveSnapshot = dp.overviewTaskThumbnailTopMarginPx;
		int totalThumbnailHeight = taskParent.getHeight() - spaceAboveSnapshot;
		int totalThumbnailWidth = taskParent.getWidth();
		int dividerBar = splitBoundsConfig.mDividerBounds.width() / 2;
		int dividerBar = splitBoundsConfig.dividerBounds.width() / 2;
		ViewGroup.LayoutParams primaryLp = mSnapshotView.getLayoutParams();
		ViewGroup.LayoutParams secondaryLp = mSnapshotView2.getLayoutParams();

		primaryLp.width = totalThumbnailWidth;
		primaryLp.height = (int)(totalThumbnailHeight * splitBoundsConfig.mLeftTaskPercent);
		primaryLp.height = (int)(totalThumbnailHeight * splitBoundsConfig.leftTaskPercent);

		secondaryLp.width = totalThumbnailWidth;
		secondaryLp.height = totalThumbnailHeight - primaryLp.height - dividerBar;