Adding a back stack to go to overview from all-apps
Change-Id: I94e7c27aa505123ddbe40ffa29b1bbc9b2748293
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 4b2e432..2a5f453 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1608,8 +1608,9 @@
if (topView != null) {
topView.onBackPressed();
} else if (!isInState(NORMAL)) {
+ LauncherState lastState = mStateManager.getLastState();
ued.logActionCommand(Action.Command.BACK, mStateManager.getState().containerType);
- mStateManager.goToState(NORMAL);
+ mStateManager.goToState(lastState);
} else {
// Back button is a no-op here, but give at least some feedback for the button press
mWorkspace.showOutlinesTemporarily();
diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java
index 4f65d19..670f579 100644
--- a/src/com/android/launcher3/LauncherState.java
+++ b/src/com/android/launcher3/LauncherState.java
@@ -170,6 +170,11 @@
};
}
+ public LauncherState getHistoryForState(LauncherState previousState) {
+ // No history is supported
+ return NORMAL;
+ }
+
protected static void dispatchWindowStateChanged(Launcher launcher) {
launcher.getWindow().getDecorView().sendAccessibilityEvent(TYPE_WINDOW_STATE_CHANGED);
}
diff --git a/src/com/android/launcher3/LauncherStateManager.java b/src/com/android/launcher3/LauncherStateManager.java
index bc4ac8b..c590953 100644
--- a/src/com/android/launcher3/LauncherStateManager.java
+++ b/src/com/android/launcher3/LauncherStateManager.java
@@ -66,7 +66,7 @@
* - Go back with back key TODO: make this not go to workspace
* - From all apps
* - From workspace
- * - Enter and exit car mode (becuase it causes an extra configuration changed)
+ * - Enter and exit car mode (becase it causes an extra configuration changed)
* - From all apps
* - From the center workspace
* - From another workspace
@@ -82,6 +82,9 @@
private StateHandler[] mStateHandlers;
private LauncherState mState = NORMAL;
+ private LauncherState mLastStableState = NORMAL;
+ private LauncherState mCurrentStableState = NORMAL;
+
private StateListener mStateListener;
public LauncherStateManager(Launcher l) {
@@ -262,11 +265,21 @@
}
private void onStateTransitionEnd(LauncherState state) {
+ // Only change the stable states after the transitions have finished
+ if (state != mCurrentStableState) {
+ mLastStableState = state.getHistoryForState(mCurrentStableState);
+ mCurrentStableState = state;
+ }
+
mLauncher.getWorkspace().setClipChildren(!state.disablePageClipping);
mLauncher.getUserEventDispatcher().resetElapsedContainerMillis();
mLauncher.finishAutoCancelActionMode();
}
+ public LauncherState getLastState() {
+ return mLastStableState;
+ }
+
/**
* Cancels the current animation.
*/