Merge changes Ib386c3b8,I2315e0af into main

* changes:
  Fix broken uses of TISBinder.refreshOverviewTarget
  Fix missing TAPL test state checks

quickstep/tests/multivalentTests/src/com/android/quickstep/AbsSwipeUpHandlerTestCase.java

@@ -34,6 +34,7 @@ import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -62,6 +63,7 @@ import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.LauncherRootView;
 import com.android.launcher3.dragndrop.DragLayer;
 import com.android.launcher3.statemanager.BaseState;
+import com.android.launcher3.statemanager.StateManager;
 import com.android.launcher3.statemanager.StatefulContainer;
 import com.android.launcher3.util.MSDLPlayerWrapper;
 import com.android.launcher3.util.SandboxApplication;
@@ -130,6 +132,7 @@ public abstract class AbsSwipeUpHandlerTestCase<
 
     protected RecentsAnimationTargets mRecentsAnimationTargets;
     protected TaskAnimationManager mTaskAnimationManager;
+    protected StateManager<STATE_TYPE, RECENTS_CONTAINER> mStateManager;
 
     @Mock protected CONTAINER_INTERFACE mActivityInterface;
     @Mock protected ContextInitListener<?> mContextInitListener;
@@ -142,6 +145,7 @@ public abstract class AbsSwipeUpHandlerTestCase<
     @Mock protected GestureState mGestureState;
     @Mock protected MSDLPlayerWrapper mMSDLPlayerWrapper;
     @Mock protected RecentsAnimationDeviceState mDeviceState;
+    @Mock protected StateManager.AtomicAnimationFactory<STATE_TYPE> mAtomicAnimationFactory;
 
     @Before
     public void setUpAnimationTargets() {
@@ -193,7 +197,7 @@ public abstract class AbsSwipeUpHandlerTestCase<
     @Before
     public void setUpRecentsContainer() {
         mTaskAnimationManager = new TaskAnimationManager(mContext, DEFAULT_DISPLAY);
-        RecentsViewContainer recentsContainer = getRecentsContainer();
+        RECENTS_CONTAINER recentsContainer = getRecentsContainer();
         RECENTS_VIEW recentsView = getRecentsView();
 
         when(recentsContainer.getDeviceProfile()).thenReturn(new DeviceProfile());
@@ -201,6 +205,7 @@ public abstract class AbsSwipeUpHandlerTestCase<
         when(recentsContainer.getDragLayer()).thenReturn(mDragLayer);
         when(recentsContainer.getRootView()).thenReturn(mRootView);
         when(recentsContainer.getSystemUiController()).thenReturn(mSystemUiController);
+        when(recentsContainer.createAtomicAnimationFactory()).thenReturn(mAtomicAnimationFactory);
         when(mActivityInterface.createActivityInitListener(any()))
                 .thenReturn(mContextInitListener);
         doReturn(recentsContainer).when(mActivityInterface).getCreatedContainer();
@@ -208,6 +213,10 @@ public abstract class AbsSwipeUpHandlerTestCase<
             answer.<Runnable>getArgument(0).run();
             return this;
         }).when(recentsContainer).runOnBindToTouchInteractionService(any());
+
+        mStateManager = spy(new StateManager<>(recentsContainer, getBaseState()));
+
+        doReturn(mStateManager).when(recentsContainer).getStateManager();
     }
 
     @Test
@@ -393,8 +402,11 @@ public abstract class AbsSwipeUpHandlerTestCase<
             long touchTimeMs, boolean continuingLastGesture);
 
     @NonNull
-    protected abstract RecentsViewContainer getRecentsContainer();
+    protected abstract RECENTS_CONTAINER getRecentsContainer();
 
     @NonNull
     protected abstract RECENTS_VIEW getRecentsView();
+
+    @NonNull
+    protected abstract STATE_TYPE getBaseState();
 }

quickstep/tests/multivalentTests/src/com/android/quickstep/FallbackSwipeHandlerTestCase.java

@@ -64,4 +64,10 @@ public class FallbackSwipeHandlerTestCase extends AbsSwipeUpHandlerTestCase<
     protected FallbackRecentsView<RecentsActivity> getRecentsView() {
         return mRecentsView;
     }
+
+    @NonNull
+    @Override
+    protected RecentsState getBaseState() {
+        return RecentsState.BG_LAUNCHER;
+    }
 }

quickstep/tests/multivalentTests/src/com/android/quickstep/LauncherSwipeHandlerV2TestCase.java

@@ -95,4 +95,10 @@ public class LauncherSwipeHandlerV2TestCase extends AbsSwipeUpHandlerTestCase<
     protected RecentsView<QuickstepLauncher, LauncherState> getRecentsView() {
         return mRecentsView;
     }
+
+    @NonNull
+    @Override
+    protected LauncherState getBaseState() {
+        return LauncherState.NORMAL;
+    }
 }

quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsWindowSwipeHandlerTestCase.java

@@ -16,6 +16,9 @@
 
 package com.android.quickstep;
 
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.when;
+
 import androidx.annotation.NonNull;
 import androidx.test.filters.SmallTest;
 
@@ -28,7 +31,6 @@ import com.android.quickstep.fallback.RecentsState;
 import com.android.quickstep.fallback.window.RecentsDisplayModel;
 import com.android.quickstep.fallback.window.RecentsWindowManager;
 import com.android.quickstep.fallback.window.RecentsWindowSwipeHandler;
-import com.android.quickstep.views.RecentsViewContainer;
 
 import dagger.BindsInstance;
 import dagger.Component;
@@ -52,6 +54,9 @@ public class RecentsWindowSwipeHandlerTestCase extends AbsSwipeUpHandlerTestCase
 
     @Before
     public void setRecentsDisplayModel() {
+        when(mRecentsDisplayModel.getRecentsWindowManager(anyInt()))
+                .thenReturn(mRecentsWindowManager);
+
         mContext.initDaggerComponent(DaggerRecentsWindowSwipeHandlerTestCase_TestComponent.builder()
                 .bindRecentsDisplayModel(mRecentsDisplayModel));
     }
@@ -73,7 +78,7 @@ public class RecentsWindowSwipeHandlerTestCase extends AbsSwipeUpHandlerTestCase
 
     @NonNull
     @Override
-    protected RecentsViewContainer getRecentsContainer() {
+    protected RecentsWindowManager getRecentsContainer() {
         return mRecentsWindowManager;
     }
 
@@ -83,6 +88,12 @@ public class RecentsWindowSwipeHandlerTestCase extends AbsSwipeUpHandlerTestCase
         return mRecentsView;
     }
 
+    @NonNull
+    @Override
+    protected RecentsState getBaseState() {
+        return RecentsState.BG_LAUNCHER;
+    }
+
     @LauncherAppSingleton
     @Component(modules = {AllModulesForTest.class})
     interface TestComponent extends LauncherAppComponent {