Merge "Revert "Adding a separate state for QuickScrub"" into ub-launcher3-master (bb8332b2) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/launcher3/LauncherAppTransitionManagerImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -218,7 +218,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		private LauncherTransitionAnimator composeRecentsLaunchAnimator(View v,
		RemoteAnimationTargetCompat[] targets) {
		// Ensure recents is actually visible
		if (!mLauncher.getStateManager().getState().overviewUi) {
		if (!mLauncher.isInState(LauncherState.OVERVIEW)) {
		return null;
		}

		@@ -720,7 +720,7 @@ public class LauncherAppTransitionManagerImpl extends LauncherAppTransitionManag
		postAtFrontOfQueueAsynchronously(handler, () -> {
		if ((Utilities.getPrefs(mLauncher)
		.getBoolean("pref_use_screenshot_for_swipe_up", false)
		&& mLauncher.getStateManager().getState().overviewUi)
		&& mLauncher.isInState(LauncherState.OVERVIEW))
		\|\| !launcherIsATargetWithMode(targets, MODE_OPENING)) {
		// We use a separate transition for Overview mode. And we can skip the
		// animation in cases where Launcher is not in the set of opening targets.

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

deleted100644 → 0

+0 −41

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 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;

		import com.android.launcher3.Launcher;

		/**
		* Extension of overview state used for QuickScrub
		*/
		public class FastOverviewState extends OverviewState {

		private static final int STATE_FLAGS = FLAG_SHOW_SCRIM \| FLAG_DISABLE_RESTORE
		\| FLAG_PAGE_BACKGROUNDS \| FLAG_DISABLE_INTERACTION \| FLAG_OVERVIEW_UI;

		private static final boolean DEBUG_DIFFERENT_UI = false;

		public FastOverviewState(int id) {
		super(id, STATE_FLAGS);
		}

		@Override
		public float getHoseatAlpha(Launcher launcher) {
		if (DEBUG_DIFFERENT_UI) {
		return 0;
		}
		return super.getHoseatAlpha(launcher);
		}
		}

src_ui_overrides/com/android/launcher3/uioverrides/FastOverviewState.java→quickstep/src/com/android/launcher3/uioverrides/IgnoreTouchesInQuickScrub.java

+19 −4

Original line number	Diff line number	Diff line
		@@ -13,14 +13,29 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.launcher3.uioverrides;

		import android.view.MotionEvent;

		import com.android.launcher3.util.TouchController;
		import com.android.quickstep.TouchInteractionService;

		/**
		* A dummy overview state
		* Consumes touches when quick scrub is enabled.
		*/
		public class FastOverviewState extends OverviewState {
		public class IgnoreTouchesInQuickScrub implements TouchController {

		public IgnoreTouchesInQuickScrub() {
		}

		@Override
		public boolean onControllerTouchEvent(MotionEvent ev) {
		return true;
		}

		public FastOverviewState(int id) {
		super(id);
		@Override
		public boolean onControllerInterceptTouchEvent(MotionEvent ev) {
		return TouchInteractionService.isQuickScrubEnabled();
		}
		}

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

+2 −6

Original line number	Diff line number	Diff line
		@@ -34,14 +34,10 @@ import com.android.quickstep.RecentsView;
		public class OverviewState extends LauncherState {

		private static final int STATE_FLAGS = FLAG_SHOW_SCRIM \| FLAG_WORKSPACE_ICONS_CAN_BE_DRAGGED
		\| FLAG_DISABLE_RESTORE \| FLAG_PAGE_BACKGROUNDS \| FLAG_OVERVIEW_UI;
		\| FLAG_DISABLE_RESTORE \| FLAG_PAGE_BACKGROUNDS;

		public OverviewState(int id) {
		this(id, STATE_FLAGS);
		}

		protected OverviewState(int id, int stateFlags) {
		super(id, ContainerType.TASKSWITCHER, OVERVIEW_TRANSITION_MS, stateFlags);
		super(id, ContainerType.TASKSWITCHER, OVERVIEW_TRANSITION_MS, STATE_FLAGS);
		}

		@Override

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -60,10 +60,10 @@ public class RecentsViewStateController implements StateHandler {

		@Override
		public void setState(LauncherState state) {
		mWorkspaceCard.setWorkspaceScrollingEnabled(state.overviewUi);
		setVisibility(state.overviewUi);
		setTransitionProgress(state.overviewUi ? 1 : 0);
		if (state.overviewUi) {
		mWorkspaceCard.setWorkspaceScrollingEnabled(state == OVERVIEW);
		setVisibility(state == OVERVIEW);
		setTransitionProgress(state == OVERVIEW ? 1 : 0);
		if (state == OVERVIEW) {
		for (int i = mRecentsView.getFirstTaskIndex(); i < mRecentsView.getPageCount(); i++) {
		((TaskView) mRecentsView.getPageAt(i)).resetVisualProperties();
		}
		@@ -92,20 +92,20 @@ public class RecentsViewStateController implements StateHandler {
		}

		ObjectAnimator progressAnim =
		mTransitionProgress.animateToValue(toState.overviewUi ? 1 : 0);
		mTransitionProgress.animateToValue(toState == OVERVIEW ? 1 : 0);
		progressAnim.setDuration(config.duration);
		progressAnim.setInterpolator(Interpolators.LINEAR);
		progressAnim.addListener(new AnimationSuccessListener() {

		@Override
		public void onAnimationSuccess(Animator animator) {
		mWorkspaceCard.setWorkspaceScrollingEnabled(toState.overviewUi);
		mWorkspaceCard.setWorkspaceScrollingEnabled(toState == OVERVIEW);
		mRecentsView.setCurrentPage(mRecentsView.getPageNearestToCenterOfScreen());
		}
		});
		builder.play(progressAnim);

		ObjectAnimator visibilityAnim = animateVisibility(toState.overviewUi);
		ObjectAnimator visibilityAnim = animateVisibility(toState == OVERVIEW);
		visibilityAnim.setDuration(config.duration);
		visibilityAnim.setInterpolator(Interpolators.LINEAR);
		builder.play(visibilityAnim);