Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename legacy SplitScreenTransitions to Legacy" into sc-dev

Browse Source
This commit is contained in:
Evan Rosky
2021-03-30 16:18:27 +00:00
committed by Android (Google) Code Review
parent df7f14b885 081b81760e
commit 7eb1c4c24e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java
View File

@@ -67,7 +67,7 @@ class LegacySplitScreenTaskListener implements ShellTaskOrganizer.TaskListener {
final SurfaceSession mSurfaceSession = new SurfaceSession(); final SurfaceSession mSurfaceSession = new SurfaceSession();
private final SplitScreenTransitions mSplitTransitions; private final LegacySplitScreenTransitions mSplitTransitions;
LegacySplitScreenTaskListener(LegacySplitScreenController splitScreenController, LegacySplitScreenTaskListener(LegacySplitScreenController splitScreenController,
ShellTaskOrganizer shellTaskOrganizer, ShellTaskOrganizer shellTaskOrganizer,
@@ -75,7 +75,7 @@ class LegacySplitScreenTaskListener implements ShellTaskOrganizer.TaskListener {
SyncTransactionQueue syncQueue) { SyncTransactionQueue syncQueue) {
mSplitScreenController = splitScreenController; mSplitScreenController = splitScreenController;
mTaskOrganizer = shellTaskOrganizer; mTaskOrganizer = shellTaskOrganizer;
mSplitTransitions = new SplitScreenTransitions(splitScreenController.mTransactionPool, mSplitTransitions = new LegacySplitScreenTransitions(splitScreenController.mTransactionPool,
transitions, mSplitScreenController, this); transitions, mSplitScreenController, this);
transitions.addHandler(mSplitTransitions); transitions.addHandler(mSplitTransitions);
mSyncQueue = syncQueue; mSyncQueue = syncQueue;
@@ -112,7 +112,7 @@ class LegacySplitScreenTaskListener implements ShellTaskOrganizer.TaskListener {
return mTaskOrganizer; return mTaskOrganizer;
} }
SplitScreenTransitions getSplitTransitions() { LegacySplitScreenTransitions getSplitTransitions() {
return mSplitTransitions; return mSplitTransitions;
} }

4
libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/SplitScreenTransitions.java → libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTransitions.java
View File

@@ -47,7 +47,7 @@ import com.android.wm.shell.transition.Transitions;
import java.util.ArrayList; import java.util.ArrayList;
/** Plays transition animations for split-screen */ /** Plays transition animations for split-screen */
public class SplitScreenTransitions implements Transitions.TransitionHandler { public class LegacySplitScreenTransitions implements Transitions.TransitionHandler {
private static final String TAG = "SplitScreenTransitions"; private static final String TAG = "SplitScreenTransitions";
public static final int TRANSIT_SPLIT_DISMISS_SNAP = TRANSIT_FIRST_CUSTOM + 10; public static final int TRANSIT_SPLIT_DISMISS_SNAP = TRANSIT_FIRST_CUSTOM + 10;
@@ -68,7 +68,7 @@ public class SplitScreenTransitions implements Transitions.TransitionHandler {
private Transitions.TransitionFinishCallback mFinishCallback = null; private Transitions.TransitionFinishCallback mFinishCallback = null;
private SurfaceControl.Transaction mFinishTransaction; private SurfaceControl.Transaction mFinishTransaction;
SplitScreenTransitions(@NonNull TransactionPool pool, @NonNull Transitions transitions, LegacySplitScreenTransitions(@NonNull TransactionPool pool, @NonNull Transitions transitions,
@NonNull LegacySplitScreenController splitScreen, @NonNull LegacySplitScreenController splitScreen,
@NonNull LegacySplitScreenTaskListener listener) { @NonNull LegacySplitScreenTaskListener listener) {
mTransactionPool = pool; mTransactionPool = pool;