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

Commit 926a10a3 authored by Luca Zuccarini's avatar Luca Zuccarini
Browse files

Create a stubbed IRemoteTransition implementation. 

Bug: 323863002
Flag: NA
Test: NA, new method is unused (still builds)
Change-Id: Ibc4187f469e41b2db91bef368c710ffbdcd33faf
parent 174e2224

quickstep/src/com/android/launcher3/desktop/DesktopRecentsTransitionController.kt

+2 −12
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ import android.os.IBinder 
import android.os.RemoteException

import android.util.Log

import android.view.SurfaceControl

import android.window.IRemoteTransition

import android.window.IRemoteTransitionFinishedCallback

import android.window.RemoteTransition

import android.window.RemoteTransitionStub

import android.window.TransitionInfo

import com.android.launcher3.statehandlers.DepthController

import com.android.launcher3.statemanager.StateManager
@@ -66,7 +66,7 @@ class DesktopRecentsTransitionController( 
        private val stateManager: StateManager<*>,

        private val depthController: DepthController?,

        private val successCallback: Consumer<Boolean>?

    ) : IRemoteTransition.Stub() {

    ) : RemoteTransitionStub() {



        override fun startAnimation(

            token: IBinder,
@@ -95,16 +95,6 @@ class DesktopRecentsTransitionController( 
                }

            }

        }



        override fun mergeAnimation(

            transition: IBinder,

            info: TransitionInfo,

            t: SurfaceControl.Transaction,

            mergeTarget: IBinder,

            finishCallback: IRemoteTransitionFinishedCallback

        ) {}



        override fun onTransitionConsumed(transition: IBinder?, aborted: Boolean) {}

    }



    companion object {

quickstep/src/com/android/quickstep/util/FadeOutRemoteTransition.kt

+2 −14
Original line number Diff line number Diff line
@@ -20,25 +20,15 @@ import android.os.IBinder 
import android.os.RemoteException

import android.view.SurfaceControl

import android.view.SurfaceControl.Transaction

import android.window.IRemoteTransition

import android.window.IRemoteTransitionFinishedCallback

import android.window.RemoteTransitionStub

import android.window.TransitionInfo

import com.android.launcher3.anim.AnimatorListeners.forEndCallback

import com.android.launcher3.util.Executors

import com.android.wm.shell.shared.TransitionUtil



/** Remote animation which fades out the closing targets */

class FadeOutRemoteTransition : IRemoteTransition.Stub() {



    override fun mergeAnimation(

        iBinder: IBinder,

        transitionInfo: TransitionInfo,

        transaction: Transaction,

        mergeTarget: IBinder,

        finishCB: IRemoteTransitionFinishedCallback

    ) {

        // Do not report finish if we don't know how to handle this transition.

    }

class FadeOutRemoteTransition : RemoteTransitionStub() {



    override fun startAnimation(

        transition: IBinder,
@@ -78,6 +68,4 @@ class FadeOutRemoteTransition : IRemoteTransition.Stub() { 


        Executors.MAIN_EXECUTOR.execute { anim.start() }

    }



    override fun onTransitionConsumed(transition: IBinder?, aborted: Boolean) {}

}

quickstep/src/com/android/quickstep/util/SlideInRemoteTransition.kt

+2 −14
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import android.os.IBinder 
import android.os.RemoteException

import android.view.SurfaceControl

import android.view.SurfaceControl.Transaction

import android.window.IRemoteTransition

import android.window.IRemoteTransitionFinishedCallback

import android.window.RemoteTransitionStub

import android.window.TransitionInfo

import com.android.launcher3.anim.AnimatorListeners.forEndCallback

import com.android.launcher3.util.Executors
@@ -36,19 +36,9 @@ class SlideInRemoteTransition( 
    private val pageSpacing: Int,

    private val cornerRadius: Float,

    private val interpolator: TimeInterpolator,

) : IRemoteTransition.Stub() {

) : RemoteTransitionStub() {

    private val animationDurationMs = 500L



    override fun mergeAnimation(

        iBinder: IBinder,

        transitionInfo: TransitionInfo,

        transaction: Transaction,

        mergeTarget: IBinder,

        finishCB: IRemoteTransitionFinishedCallback

    ) {

        // Do not report finish if we don't know how to handle this transition.

    }



    override fun startAnimation(

        transition: IBinder,

        info: TransitionInfo,
@@ -116,6 +106,4 @@ class SlideInRemoteTransition( 


        Executors.MAIN_EXECUTOR.execute { anim.start() }

    }



    override fun onTransitionConsumed(transition: IBinder?, aborted: Boolean) {}

}

quickstep/src/com/android/quickstep/util/SplitSelectStateController.java

+2 −9
Original line number Diff line number Diff line
@@ -63,9 +63,9 @@ import android.util.Pair; 
import android.view.RemoteAnimationAdapter;

import android.view.RemoteAnimationTarget;

import android.view.SurfaceControl;

import android.window.IRemoteTransition;

import android.window.IRemoteTransitionFinishedCallback;

import android.window.RemoteTransition;

import android.window.RemoteTransitionStub;

import android.window.TransitionInfo;



import androidx.annotation.Nullable;
@@ -730,7 +730,7 @@ public class SplitSelectStateController { 
    /**

     * Requires Shell Transitions

     */

    private class RemoteSplitLaunchTransitionRunner extends IRemoteTransition.Stub {

    private class RemoteSplitLaunchTransitionRunner extends RemoteTransitionStub {



        private final int mInitialTaskId;

        private final int mSecondTaskId;
@@ -778,13 +778,6 @@ public class SplitSelectStateController { 
            });

        }



        @Override

        public void mergeAnimation(IBinder transition, TransitionInfo info,

                SurfaceControl.Transaction t, IBinder mergeTarget,

                IRemoteTransitionFinishedCallback finishedCallback) {

            // Do not report finish if we don't know how to handle this transition.

        }



        @Override

        public void onTransitionConsumed(IBinder transition, boolean aborted)

                throws RemoteException {