From 081b81760ec8c35e5d848500bab5bea69d8d7f5f Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Wed, 24 Mar 2021 19:34:53 -0700 Subject: [PATCH] Rename legacy SplitScreenTransitions to Legacy Make the naming consistent with everything else. Bug: 182002789 Test: N/A, just renaming Change-Id: Ifda350d7c088f414746e3990f5272425496f84c6 --- .../legacysplitscreen/LegacySplitScreenTaskListener.java | 6 +++--- ...enTransitions.java => LegacySplitScreenTransitions.java} | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/{SplitScreenTransitions.java => LegacySplitScreenTransitions.java} (98%) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java index f4c0f9384705b..cf35656a395be 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java @@ -67,7 +67,7 @@ class LegacySplitScreenTaskListener implements ShellTaskOrganizer.TaskListener { final SurfaceSession mSurfaceSession = new SurfaceSession(); - private final SplitScreenTransitions mSplitTransitions; + private final LegacySplitScreenTransitions mSplitTransitions; LegacySplitScreenTaskListener(LegacySplitScreenController splitScreenController, ShellTaskOrganizer shellTaskOrganizer, @@ -75,7 +75,7 @@ class LegacySplitScreenTaskListener implements ShellTaskOrganizer.TaskListener { SyncTransactionQueue syncQueue) { mSplitScreenController = splitScreenController; mTaskOrganizer = shellTaskOrganizer; - mSplitTransitions = new SplitScreenTransitions(splitScreenController.mTransactionPool, + mSplitTransitions = new LegacySplitScreenTransitions(splitScreenController.mTransactionPool, transitions, mSplitScreenController, this); transitions.addHandler(mSplitTransitions); mSyncQueue = syncQueue; @@ -112,7 +112,7 @@ class LegacySplitScreenTaskListener implements ShellTaskOrganizer.TaskListener { return mTaskOrganizer; } - SplitScreenTransitions getSplitTransitions() { + LegacySplitScreenTransitions getSplitTransitions() { return mSplitTransitions; } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/SplitScreenTransitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTransitions.java similarity index 98% rename from libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/SplitScreenTransitions.java rename to libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTransitions.java index d06064a82ff0c..27c56fd55e404 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/SplitScreenTransitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTransitions.java @@ -47,7 +47,7 @@ import com.android.wm.shell.transition.Transitions; import java.util.ArrayList; /** Plays transition animations for split-screen */ -public class SplitScreenTransitions implements Transitions.TransitionHandler { +public class LegacySplitScreenTransitions implements Transitions.TransitionHandler { private static final String TAG = "SplitScreenTransitions"; 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 SurfaceControl.Transaction mFinishTransaction; - SplitScreenTransitions(@NonNull TransactionPool pool, @NonNull Transitions transitions, + LegacySplitScreenTransitions(@NonNull TransactionPool pool, @NonNull Transitions transitions, @NonNull LegacySplitScreenController splitScreen, @NonNull LegacySplitScreenTaskListener listener) { mTransactionPool = pool;