Merge "Add QuickSwitchTouchController on home" into ub-launcher3-master (ae775276) · Commits · e / os / android_packages_apps_Trebuchet

go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -100,4 +100,8 @@ public class OverviewState extends LauncherState {
		public static OverviewState newPeekState(int id) {
		return new OverviewState(id);
		}

		public static OverviewState newSwitchState(int id) {
		return new OverviewState(id);
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeCont
		import com.android.launcher3.uioverrides.touchcontrollers.OverviewToAllAppsTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.QuickSwitchTouchController;
		import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController;
		import com.android.launcher3.util.TouchController;
		import com.android.launcher3.util.UiThreadHelper;
		@@ -66,6 +67,7 @@ public abstract class RecentsUiFactory {
		list.add(launcher.getDragController());

		if (swipeUpToHome) {
		list.add(new QuickSwitchTouchController(launcher));
		list.add(new FlingAndHoldTouchController(launcher));
		} else {
		if (launcher.getDeviceProfile().isVerticalBarLayout()) {
		@@ -74,6 +76,9 @@ public abstract class RecentsUiFactory {
		} else {
		list.add(new PortraitStatesTouchController(launcher,
		swipeUpEnabled /* allowDragToOverview */));
		if (swipeUpEnabled) {
		list.add(new QuickSwitchTouchController(launcher));
		}
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java

+11 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.launcher3.uioverrides.states;
		import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;
		import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
		import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE;
		import static com.android.launcher3.logging.LoggerUtils.getTargetStr;
		import static com.android.launcher3.logging.LoggerUtils.newContainerTarget;
		import static com.android.launcher3.states.RotationHelper.REQUEST_ROTATE;

		@@ -52,7 +53,11 @@ public class OverviewState extends LauncherState {
		}

		protected OverviewState(int id, int transitionDuration, int stateFlags) {
		super(id, ContainerType.TASKSWITCHER, transitionDuration, stateFlags);
		this(id, ContainerType.TASKSWITCHER, transitionDuration, stateFlags);
		}

		protected OverviewState(int id, int logContainer, int transitionDuration, int stateFlags) {
		super(id, logContainer, transitionDuration, stateFlags);
		}

		@Override
		@@ -92,6 +97,7 @@ public class OverviewState extends LauncherState {
		DiscoveryBounce.showForOverviewIfNeeded(launcher);
		}

		@Override
		public PageAlphaProvider getWorkspacePageAlphaProvider(Launcher launcher) {
		return new PageAlphaProvider(DEACCEL_2) {
		@Override
		@@ -159,4 +165,8 @@ public class OverviewState extends LauncherState {
		public static OverviewState newPeekState(int id) {
		return new OverviewPeekState(id);
		}

		public static OverviewState newSwitchState(int id) {
		return new QuickSwitchState(id);
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java

0 → 100644

+89 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.launcher3.uioverrides.states;

		import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;

		import android.graphics.Rect;

		import com.android.launcher3.Launcher;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.quickstep.util.ClipAnimationHelper;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskThumbnailView;
		import com.android.quickstep.views.TaskView;

		/**
		* State to indicate we are about to launch a recent task. Note that this state is only used when
		* quick switching from launcher; quick switching from an app uses WindowTransformSwipeHelper.
		* @see com.android.quickstep.WindowTransformSwipeHandler.GestureEndTarget#NEW_TASK
		*/
		public class QuickSwitchState extends OverviewState {
		private static final int STATE_FLAGS =
		FLAG_DISABLE_RESTORE \| FLAG_OVERVIEW_UI \| FLAG_DISABLE_ACCESSIBILITY;

		public QuickSwitchState(int id) {
		super(id, LauncherLogProto.ContainerType.APP, OVERVIEW_TRANSITION_MS, STATE_FLAGS);
		}

		@Override
		public ScaleAndTranslation getOverviewScaleAndTranslation(Launcher launcher) {
		RecentsView recentsView = launcher.getOverviewPanel();
		if (recentsView.getTaskViewCount() == 0) {
		return super.getOverviewScaleAndTranslation(launcher);
		}
		// Compute scale and translation y such that the most recent task view fills the screen.
		TaskThumbnailView dummyThumbnail = recentsView.getTaskViewAt(0).getThumbnail();
		ClipAnimationHelper clipAnimationHelper = new ClipAnimationHelper(launcher);
		clipAnimationHelper.fromTaskThumbnailView(dummyThumbnail, recentsView);
		Rect targetRect = new Rect();
		recentsView.getTaskSize(targetRect);
		clipAnimationHelper.updateTargetRect(targetRect);
		float toScale = clipAnimationHelper.getSourceRect().width()
		/ clipAnimationHelper.getTargetRect().width();
		float toTranslationY = clipAnimationHelper.getSourceRect().centerY()
		- clipAnimationHelper.getTargetRect().centerY();
		return new ScaleAndTranslation(toScale, 0, toTranslationY);
		}

		@Override
		public ScaleAndTranslation getWorkspaceScaleAndTranslation(Launcher launcher) {
		float shiftRange = launcher.getAllAppsController().getShiftRange();
		float shiftProgress = getVerticalProgress(launcher) - NORMAL.getVerticalProgress(launcher);
		float translationY = shiftProgress * shiftRange;
		return new ScaleAndTranslation(1, 0, translationY);
		}

		@Override
		public float getVerticalProgress(Launcher launcher) {
		return BACKGROUND_APP.getVerticalProgress(launcher);
		}

		@Override
		public int getVisibleElements(Launcher launcher) {
		return NONE;
		}

		@Override
		public void onStateTransitionEnd(Launcher launcher) {
		TaskView tasktolaunch = launcher.<RecentsView>getOverviewPanel().getTaskViewAt(0);
		if (tasktolaunch != null) {
		tasktolaunch.launchTask(false);
		} else {
		launcher.getStateManager().goToState(NORMAL);
		}
		}
		}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/QuickSwitchTouchController.java

0 → 100644

+147 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.launcher3.uioverrides.touchcontrollers;

		import static com.android.launcher3.LauncherState.NORMAL;
		import static com.android.launcher3.LauncherState.QUICK_SWITCH;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_ALL_APPS_FADE;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_FADE;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_SCALE;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_OVERVIEW_TRANSLATE_Y;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_VERTICAL_PROGRESS;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_FADE;
		import static com.android.launcher3.anim.AnimatorSetBuilder.ANIM_WORKSPACE_TRANSLATE;
		import static com.android.launcher3.anim.Interpolators.ACCEL_2;
		import static com.android.launcher3.anim.Interpolators.DEACCEL_2;
		import static com.android.launcher3.anim.Interpolators.INSTANT;
		import static com.android.launcher3.anim.Interpolators.LINEAR;

		import android.view.MotionEvent;

		import com.android.launcher3.Launcher;
		import com.android.launcher3.LauncherState;
		import com.android.launcher3.LauncherStateManager;
		import com.android.launcher3.Utilities;
		import com.android.launcher3.anim.AnimatorSetBuilder;
		import com.android.launcher3.config.FeatureFlags;
		import com.android.launcher3.touch.AbstractStateChangeTouchController;
		import com.android.launcher3.touch.SwipeDetector;
		import com.android.launcher3.userevent.nano.LauncherLogProto;
		import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Direction;
		import com.android.quickstep.views.RecentsView;
		import com.android.quickstep.views.TaskView;

		import androidx.annotation.Nullable;

		/**
		* Handles quick switching to a recent task from the home screen.
		*/
		public class QuickSwitchTouchController extends AbstractStateChangeTouchController {

		private @Nullable TaskView mTaskToLaunch;

		public QuickSwitchTouchController(Launcher launcher) {
		super(launcher, SwipeDetector.HORIZONTAL);
		}

		@Override
		protected boolean canInterceptTouch(MotionEvent ev) {
		if (mCurrentAnimation != null) {
		return true;
		}
		if (!mLauncher.isInState(LauncherState.NORMAL)) {
		return false;
		}
		if ((ev.getEdgeFlags() & Utilities.EDGE_NAV_BAR) == 0) {
		return false;
		}
		return true;
		}

		@Override
		protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
		return isDragTowardPositive ? QUICK_SWITCH : NORMAL;
		}

		@Override
		public void onDragStart(boolean start) {
		super.onDragStart(start);
		mStartContainerType = LauncherLogProto.ContainerType.NAVBAR;
		mTaskToLaunch = mLauncher.<RecentsView>getOverviewPanel().getTaskViewAt(0);
		}

		@Override
		protected void onSwipeInteractionCompleted(LauncherState targetState, int logAction) {
		super.onSwipeInteractionCompleted(targetState, logAction);
		mTaskToLaunch = null;
		}

		@Override
		protected float initCurrentAnimation(int animComponents) {
		AnimatorSetBuilder animatorSetBuilder = new AnimatorSetBuilder();
		setupInterpolators(animatorSetBuilder);
		long accuracy = (long) (getShiftRange() * 2);
		mCurrentAnimation = mLauncher.getStateManager().createAnimationToNewWorkspace(mToState,
		animatorSetBuilder, accuracy, this::clearState, LauncherStateManager.ANIM_ALL);
		mCurrentAnimation.getAnimationPlayer().addUpdateListener(valueAnimator -> {
		updateFullscreenProgress((Float) valueAnimator.getAnimatedValue());
		});
		return 1 / getShiftRange();
		}

		private void setupInterpolators(AnimatorSetBuilder animatorSetBuilder) {
		animatorSetBuilder.setInterpolator(ANIM_WORKSPACE_FADE, DEACCEL_2);
		animatorSetBuilder.setInterpolator(ANIM_ALL_APPS_FADE, DEACCEL_2);
		if (FeatureFlags.SWIPE_HOME.get()) {
		// Overview lives to the left of workspace, so translate down later than over
		animatorSetBuilder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, ACCEL_2);
		animatorSetBuilder.setInterpolator(ANIM_VERTICAL_PROGRESS, ACCEL_2);
		animatorSetBuilder.setInterpolator(ANIM_OVERVIEW_SCALE, ACCEL_2);
		animatorSetBuilder.setInterpolator(ANIM_OVERVIEW_TRANSLATE_Y, ACCEL_2);
		animatorSetBuilder.setInterpolator(ANIM_OVERVIEW_FADE, INSTANT);
		} else {
		animatorSetBuilder.setInterpolator(ANIM_WORKSPACE_TRANSLATE, LINEAR);
		animatorSetBuilder.setInterpolator(ANIM_VERTICAL_PROGRESS, LINEAR);
		}
		}

		@Override
		protected void updateProgress(float progress) {
		super.updateProgress(progress);
		updateFullscreenProgress(progress);
		}

		private void updateFullscreenProgress(float progress) {
		if (mTaskToLaunch != null) {
		mTaskToLaunch.setFullscreenProgress(progress);
		}
		}

		@Override
		protected float getShiftRange() {
		return mLauncher.getDeviceProfile().widthPx / 2f;
		}

		@Override
		protected int getLogContainerTypeForNormalState() {
		return LauncherLogProto.ContainerType.NAVBAR;
		}

		@Override
		protected int getDirectionForLog() {
		return Utilities.isRtl(mLauncher.getResources()) ? Direction.LEFT : Direction.RIGHT;
		}
		}