aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-05 18:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "initial commit for multicontext management for recent windows" into main

Browse Source
This commit is contained in:
Randy Pfohl
2024-12-09 22:27:52 +00:00
committed by Android (Google) Code Review
parent 3d76150128 81962e6fac
commit 6cbf910d9a
15 changed files with 214 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
quickstep/tests/multivalentTests/src/com/android/quickstep/AbsSwipeUpHandlerTestCase.java
View File

@@ -59,7 +59,7 @@ import com.android.launcher3.dragndrop.DragLayer;
import com.android.launcher3.statemanager.BaseState;
import com.android.launcher3.statemanager.StatefulContainer;
import com.android.launcher3.util.SystemUiController;
import com.android.quickstep.fallback.window.RecentsWindowManager;
import com.android.quickstep.fallback.window.RecentsWindowFactory;
import com.android.quickstep.util.ContextInitListener;
import com.android.quickstep.views.RecentsView;
import com.android.quickstep.views.RecentsViewContainer;
@@ -173,7 +173,8 @@ public abstract class AbsSwipeUpHandlerTestCase<
@Before
public void setUpRecentsContainer() {
mTaskAnimationManager = new TaskAnimationManager(mContext, getRecentsWindowManager());
mTaskAnimationManager = new TaskAnimationManager(mContext, getRecentsWindowFactory(),
mRecentsAnimationDeviceState);
RecentsViewContainer recentsContainer = getRecentsContainer();
RECENTS_VIEW recentsView = getRecentsView();
@@ -365,7 +366,7 @@ public abstract class AbsSwipeUpHandlerTestCase<
}
@Nullable
protected RecentsWindowManager getRecentsWindowManager() {
protected RecentsWindowFactory getRecentsWindowFactory() {
return null;
}

19
quickstep/tests/multivalentTests/src/com/android/quickstep/RecentsWindowSwipeHandlerTestCase.java
View File

@@ -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.annotation.Nullable;
import androidx.test.filters.SmallTest;
@@ -23,10 +26,12 @@ import androidx.test.filters.SmallTest;
import com.android.launcher3.util.LauncherMultivalentJUnit;
import com.android.quickstep.fallback.FallbackRecentsView;
import com.android.quickstep.fallback.RecentsState;
import com.android.quickstep.fallback.window.RecentsWindowFactory;
import com.android.quickstep.fallback.window.RecentsWindowManager;
import com.android.quickstep.fallback.window.RecentsWindowSwipeHandler;
import com.android.quickstep.views.RecentsViewContainer;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -39,8 +44,14 @@ public class RecentsWindowSwipeHandlerTestCase extends AbsSwipeUpHandlerTestCase
RecentsWindowSwipeHandler,
FallbackWindowInterface> {
@Mock private RecentsWindowManager mRecentsWindowManager;
@Mock private RecentsWindowFactory mRecentsWindowFactory;
@Mock private FallbackRecentsView<RecentsWindowManager> mRecentsView;
@Mock private RecentsWindowManager mRecentsWindowManager;
@Before
public void setupRecentsWindowFactory() {
when(mRecentsWindowFactory.get(anyInt())).thenReturn(mRecentsWindowManager);
}
@NonNull
@Override
@@ -54,13 +65,13 @@ public class RecentsWindowSwipeHandlerTestCase extends AbsSwipeUpHandlerTestCase
touchTimeMs,
continuingLastGesture,
mInputConsumerController,
mRecentsWindowManager);
mRecentsWindowFactory);
}
@Nullable
@Override
protected RecentsWindowManager getRecentsWindowManager() {
return mRecentsWindowManager;
protected RecentsWindowFactory getRecentsWindowFactory() {
return mRecentsWindowFactory;
}
@NonNull