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

Commit b8ad6e08 authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Revert "Use new onStartSplitLegacy when starting split from overview" 

Revert submission 17779173-startSplitLegacy

Reason for revert: Broken build: b/230129218
Reverted Changes:
I01590e53c:Remove check for preventing re-parenting non-split...
I696749f76:Use new onStartSplitLegacy when starting split fro...

Change-Id: I6d81e0584bbfda3694772dcf293a4d064b2e8517
parent dd7e132d

quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java

+2 −1
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ public class RecentsAnimationCallbacks implements 
                .map(RemoteAnimationTargetCompat::unwrap)

                .toArray(RemoteAnimationTarget[]::new);



        RemoteAnimationTarget[] nonAppTargets = mSystemUiProxy.onGoingToRecentsLegacy(nonHomeApps);

        RemoteAnimationTarget[] nonAppTargets =

                mSystemUiProxy.onGoingToRecentsLegacy(mCancelled, nonHomeApps);



        RecentsAnimationTargets targets = new RecentsAnimationTargets(appTargets,

                wallpaperTargets, RemoteAnimationTargetCompat.wrap(nonAppTargets),

quickstep/src/com/android/quickstep/SystemUiProxy.java

+4 −13
Original line number Diff line number Diff line
@@ -676,12 +676,14 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI 
     * Call this when going to recents so that shell can set-up and provide appropriate leashes

     * for animation (eg. DividerBar).

     *

     * @param cancel true if recents starting is being cancelled.

     * @return RemoteAnimationTargets of windows that need to animate but only exist in shell.

     */

    public RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) {

    public RemoteAnimationTarget[] onGoingToRecentsLegacy(boolean cancel,

            RemoteAnimationTarget[] apps) {

        if (mSplitScreen != null) {

            try {

                return mSplitScreen.onGoingToRecentsLegacy(apps);

                return mSplitScreen.onGoingToRecentsLegacy(cancel, apps);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed call onGoingToRecentsLegacy");

            }
@@ -689,17 +691,6 @@ public class SystemUiProxy implements ISystemUiProxy, DisplayController.DisplayI 
        return null;

    }



    public RemoteAnimationTarget[] onStartingSplitLegacy(RemoteAnimationTarget[] apps) {

        if (mSplitScreen != null) {

            try {

                return mSplitScreen.onStartingSplitLegacy(apps);

            } catch (RemoteException e) {

                Log.w(TAG, "Failed call onStartingSplitLegacy");

            }

        }

        return null;

    }



    //

    // One handed

    //

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+2 −3
Original line number Diff line number Diff line
@@ -177,9 +177,8 @@ public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAn 
                    ((RecentsActivity) activityInterface.getCreatedActivity()).startHome();

                    return;

                }



                RemoteAnimationTarget[] nonAppTargets =

                        SystemUiProxy.INSTANCE.getNoCreate().onStartingSplitLegacy(nonHomeApps);

                RemoteAnimationTarget[] nonAppTargets = SystemUiProxy.INSTANCE.get(mCtx)

                        .onGoingToRecentsLegacy(false, nonHomeApps);



                if (ENABLE_QUICKSTEP_LIVE_TILE.get() && activityInterface.isInLiveTileMode()

                        && activityInterface.getCreatedActivity() != null) {