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

Commit b57e29f7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use new onStartSplitLegacy when starting split from overview" into tm-dev am: 8aead550 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17779173



Change-Id: I80e76bd5ba842b14add3b407b288da4e481a0364
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50d096bc 8aead550

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

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

                .toArray(RemoteAnimationTarget[]::new);



        RemoteAnimationTarget[] nonAppTargets =

                mSystemUiProxy.onGoingToRecentsLegacy(mCancelled, nonHomeApps);

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



        RecentsAnimationTargets targets = new RecentsAnimationTargets(appTargets,

                wallpaperTargets, RemoteAnimationTargetCompat.wrap(nonAppTargets),

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

+13 −4
Original line number Diff line number Diff line
@@ -676,14 +676,12 @@ 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(boolean cancel,

            RemoteAnimationTarget[] apps) {

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

        if (mSplitScreen != null) {

            try {

                return mSplitScreen.onGoingToRecentsLegacy(cancel, apps);

                return mSplitScreen.onGoingToRecentsLegacy(apps);

            } catch (RemoteException e) {

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

            }
@@ -691,6 +689,17 @@ 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

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

                    return;

                }

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

                        .onGoingToRecentsLegacy(false, nonHomeApps);



                RemoteAnimationTarget[] nonAppTargets =

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



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

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