PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable returning to the previous app after Overview -> All Apps." into udc-qpr-dev am: e769a86dc5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23595182

Change-Id: Ib52e2ab2cae6129e19d8615a3087ddf296e22119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Wickham
2023-06-08 23:11:20 +00:00
committed by Automerger Merge Worker
parent e2f7071efe e769a86dc5
commit c41f302e6b
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+1 -1
View File
@@ -519,7 +519,7 @@ public class QuickstepLauncher extends Launcher {
}
case QUICK_SWITCH_STATE_ORDINAL: {
RecentsView rv = getOverviewPanel();
TaskView tasktolaunch = rv.getTaskViewAt(0);
TaskView tasktolaunch = rv.getCurrentPageTaskView();
if (tasktolaunch != null) {
tasktolaunch.launchTask(success -> {
if (!success) {
quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+14 -1
View File
@@ -23,6 +23,7 @@ import android.content.Context;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
import com.android.launcher3.R;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.util.Themes;
import com.android.launcher3.views.ActivityContext;
@@ -110,7 +111,19 @@ public class AllAppsState extends LauncherState {
@Override
public LauncherState getHistoryForState(LauncherState previousState) {
return previousState == OVERVIEW ? OVERVIEW : NORMAL;
return previousState == BACKGROUND_APP ? QUICK_SWITCH_FROM_HOME
: previousState == OVERVIEW ? OVERVIEW : NORMAL;
}
@Override
public float[] getOverviewScaleAndOffset(Launcher launcher) {
if (!FeatureFlags.ENABLE_ALL_APPS_FROM_OVERVIEW.get()) {
return super.getOverviewScaleAndOffset(launcher);
}
// This handles the case of returning to the previous app from Overview -> All Apps gesture.
// This is the start scale/offset of overview that will be used for that transition.
// TODO (b/283336332): Translate in Y direction (ideally with overview resistance).
return new float[] {0.5f /* scale */, NO_OFFSET};
}
@Override
quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java
+4 -1
View File
@@ -29,6 +29,7 @@ import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Launcher;
import com.android.launcher3.LauncherState;
import com.android.launcher3.allapps.AllAppsTransitionController;
import com.android.launcher3.config.FeatureFlags;
import com.android.launcher3.states.StateAnimationConfig;
import com.android.launcher3.touch.AbstractStateChangeTouchController;
import com.android.launcher3.touch.AllAppsSwipeController;
@@ -92,7 +93,9 @@ public class PortraitStatesTouchController extends AbstractStateChangeTouchContr
@Override
protected LauncherState getTargetState(LauncherState fromState, boolean isDragTowardPositive) {
if (fromState == ALL_APPS && !isDragTowardPositive) {
return NORMAL;
return FeatureFlags.ENABLE_ALL_APPS_FROM_OVERVIEW.get()
? mLauncher.getStateManager().getLastState()
: NORMAL;
} else if (fromState == OVERVIEW) {
return isDragTowardPositive ? OVERVIEW : NORMAL;
} else if (fromState == NORMAL && isDragTowardPositive) {