Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eb1c4c2 authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

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

parents df7f14b8 081b8176

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

+3 −3
Original line number Diff line number Diff line
@@ -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;

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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;