diff options
author | Kevin Han <kevhan@google.com> | 2019-01-24 20:36:04 +0000 |
---|---|---|
committer | Kevin Han <kevhan@google.com> | 2019-01-24 20:36:04 +0000 |
commit | 57f88bd0ec9d9b077d57df1ae39f9e88085aa92f (patch) | |
tree | e1cd11441ca9b2f3a981a465e360085d954eb84d /quickstep/recents_ui_overrides/src/com/android | |
parent | 792fcc3aec4e085fc864541fb0396ef09bd23342 (diff) | |
download | android_packages_apps_Trebuchet-57f88bd0ec9d9b077d57df1ae39f9e88085aa92f.tar.gz android_packages_apps_Trebuchet-57f88bd0ec9d9b077d57df1ae39f9e88085aa92f.tar.bz2 android_packages_apps_Trebuchet-57f88bd0ec9d9b077d57df1ae39f9e88085aa92f.zip |
Revert "Remove OverviewToAllAppsController for Go"
This reverts commit 792fcc3aec4e085fc864541fb0396ef09bd23342.
Reason for revert: This class actually manages more than just overview to all apps transitions, and Go needs some form of this for landscape transitions state transitions
Change-Id: I073dcc94dda06ff8d87166d2674927df8f2418f5
Diffstat (limited to 'quickstep/recents_ui_overrides/src/com/android')
2 files changed, 1 insertions, 101 deletions
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java deleted file mode 100644 index 0f9b57f03..000000000 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2017 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 static com.android.launcher3.LauncherState.ALL_APPS; -import static com.android.launcher3.LauncherState.NORMAL; -import static com.android.launcher3.LauncherState.OVERVIEW; - -import android.view.MotionEvent; - -import com.android.launcher3.AbstractFloatingView; -import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherState; -import com.android.launcher3.userevent.nano.LauncherLogProto; -import com.android.quickstep.TouchInteractionService; -import com.android.quickstep.views.RecentsView; - -/** - * Touch controller from going from OVERVIEW to ALL_APPS. - * - * This is used in landscape mode. It is also used in portrait mode for the fallback recents. - */ -public class OverviewToAllAppsTouchController extends PortraitStatesTouchController { - - public OverviewToAllAppsTouchController(Launcher l) { - super(l); - } - - @Override - protected boolean canInterceptTouch(MotionEvent ev) { - if (mCurrentAnimation != null) { - // If we are already animating from a previous state, we can intercept. - return true; - } - if (AbstractFloatingView.getTopOpenView(mLauncher) != null) { - return false; - } - if (mLauncher.isInState(ALL_APPS)) { - // In all-apps only listen if the container cannot scroll itself - return mLauncher.getAppsView().shouldContainerScroll(ev); - } else if (mLauncher.isInState(NORMAL)) { - return true; - } else if (mLauncher.isInState(OVERVIEW)) { - RecentsView rv = mLauncher.getOverviewPanel(); - return ev.getY() > (rv.getBottom() - rv.getPaddingBottom()); - } else { - return false; - } - } - - @Override - protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) { - if (fromState == ALL_APPS && !isDragTowardPositive) { - // Should swipe down go to OVERVIEW instead? - return TouchInteractionService.isConnected() ? - mLauncher.getStateManager().getLastState() : NORMAL; - } else if (isDragTowardPositive) { - return ALL_APPS; - } - return fromState; - } - - @Override - protected int getLogContainerTypeForNormalState() { - return LauncherLogProto.ContainerType.WORKSPACE; - } -} diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java index 0b62beed1..f18f43c4c 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java @@ -22,14 +22,11 @@ import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; -import androidx.annotation.Nullable; - import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.LauncherStateManager.StateHandler; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.util.TouchController; -import com.android.quickstep.OverviewInteractionState; import com.android.quickstep.views.RecentsView; /** @@ -48,28 +45,11 @@ public final class RecentsUiFactory { * @param launcher the launcher activity * @return the touch controller for recents tasks */ - public static @Nullable TouchController createTaskSwipeController(Launcher launcher) { + public static TouchController createTaskSwipeController(Launcher launcher) { return new LauncherTaskViewController(launcher); } /** - * Creates and returns a touch controller for swiping from overview state to the all apps state - * if such an action is supported. - * - * @param launcher the launcher activity - * @return the touch controller for swiping from overview to all apps - */ - public static @Nullable TouchController createOverviewToAllAppsTouchController( - Launcher launcher) { - boolean swipeUpEnabled = OverviewInteractionState.INSTANCE.get(launcher) - .isSwipeUpGestureEnabled(); - if (!swipeUpEnabled || launcher.getDeviceProfile().isVerticalBarLayout()) { - return new OverviewToAllAppsTouchController(launcher); - } - return null; - } - - /** * Creates and returns the controller responsible for recents view state transitions. * * @param launcher the launcher activity |