commit 9bb040ec6d05c780ac6d9287b70e269d2c782a8e
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 12 22:41:36 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 12 22:41:36 2021 +0000
tree 77e018e4c1be93bc5a562100b00a1da1c01c0268
parent 484b34bf28e6b6d8e9ba17e9cbd70dd5228e6c1d
parent 58dfd4d2095c1c5ce44f7f7cce3a355823259c41

Merge "Handle transitining out of overview more gracefully for 3P launchers" into sc-dev

quickstep/src/com/android/quickstep/FallbackActivityInterface.java

diff --git a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
index e13d1a4..8168e88 100644
--- a/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
+++ b/quickstep/src/com/android/quickstep/FallbackActivityInterface.java
@@ -27,6 +27,7 @@
 import androidx.annotation.Nullable;
 
 import com.android.launcher3.DeviceProfile;
+import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.touch.PagedOrientationHandler;
 import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.util.ActivityInitListener;
@@ -139,7 +140,25 @@
 
     @Override
     public void onExitOverview(RotationTouchHelper deviceState, Runnable exitRunnable) {
-        // no-op, fake landscape not supported for 3P
+        final StateManager<RecentsState> stateManager = getCreatedActivity().getStateManager();
+        if (stateManager.getState() == HOME) {
+            exitRunnable.run();
+            notifyRecentsOfOrientation(deviceState);
+            return;
+        }
+
+        stateManager.addStateListener(
+                new StateManager.StateListener<RecentsState>() {
+                    @Override
+                    public void onStateTransitionComplete(RecentsState toState) {
+                        // Are we going from Recents to Workspace?
+                        if (toState == HOME) {
+                            exitRunnable.run();
+                            notifyRecentsOfOrientation(deviceState);
+                            stateManager.removeStateListener(this);
+                        }
+                    }
+                });
     }
 
     @Override