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

Merge "Refactor SplitSelectStateController to add testing" into tm-qpr-dev am: c9120521ff

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

Change-Id: Id91fe8d96fbcc1cdad9ef59610c934e59c441410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinit Nayak
2023-02-22 22:30:50 +00:00
committed by Automerger Merge Worker
parent 6afdd8eab2 c9120521ff
commit 2fea4c6f1b
4 changed files with 220 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+2 -1
View File
@@ -235,7 +235,8 @@ public class QuickstepLauncher extends Launcher {
RecentsView overviewPanel = getOverviewPanel();
mSplitSelectStateController =
new SplitSelectStateController(this, mHandler, getStateManager(),
getDepthController(), getStatsLogManager());
getDepthController(), getStatsLogManager(),
SystemUiProxy.INSTANCE.get(this), RecentsModel.INSTANCE.get(this));
overviewPanel.init(mActionsView, mSplitSelectStateController);
mSplitWithKeyboardShortcutController = new SplitWithKeyboardShortcutController(this,
mSplitSelectStateController);
quickstep/src/com/android/quickstep/RecentsActivity.java
+2 -1
View File
@@ -134,7 +134,8 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> {
SplitSelectStateController controller =
new SplitSelectStateController(this, mHandler, getStateManager(),
/* depthController */ null, getStatsLogManager());
null /* depthController */, getStatsLogManager(),
SystemUiProxy.INSTANCE.get(this), RecentsModel.INSTANCE.get(this));
mDragLayer.recreateControllers();
mFallbackRecentsView.init(mActionsView, controller);
quickstep/src/com/android/quickstep/util/SplitSelectStateController.java
+4 -3
View File
@@ -107,14 +107,15 @@ public class SplitSelectStateController {
private FloatingTaskView mFirstFloatingTaskView;
public SplitSelectStateController(Context context, Handler handler, StateManager stateManager,
DepthController depthController, StatsLogManager statsLogManager) {
DepthController depthController, StatsLogManager statsLogManager,
SystemUiProxy systemUiProxy, RecentsModel recentsModel) {
mContext = context;
mHandler = handler;
mStatsLogManager = statsLogManager;
mSystemUiProxy = SystemUiProxy.INSTANCE.get(mContext);
mSystemUiProxy = systemUiProxy;
mStateManager = stateManager;
mDepthController = depthController;
mRecentTasksModel = RecentsModel.INSTANCE.get(context);
mRecentTasksModel = recentsModel;
}
/**