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

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

Merge "Do not evict starting task when startShortcut" into tm-qpr-dev am: 8a1fa447 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19448394



Change-Id: I1657690cb90d08d8edbd52f4102571b41ca9b39e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a626436 8a1fa447

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java

+28 −6
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static com.android.wm.shell.splitscreen.SplitScreen.STAGE_TYPE_UNDEFINED; 
import static com.android.wm.shell.transition.Transitions.ENABLE_SHELL_TRANSITIONS;



import android.app.ActivityManager;

import android.app.ActivityOptions;

import android.app.ActivityTaskManager;

import android.app.PendingIntent;

import android.content.ActivityNotFoundException;
@@ -46,6 +47,7 @@ import android.os.UserHandle; 
import android.util.ArrayMap;

import android.util.Slog;

import android.view.IRemoteAnimationFinishedCallback;

import android.view.IRemoteAnimationRunner;

import android.view.RemoteAnimationAdapter;

import android.view.RemoteAnimationTarget;

import android.view.SurfaceControl;
@@ -334,17 +336,37 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 


    public void startShortcut(String packageName, String shortcutId, @SplitPosition int position,

            @Nullable Bundle options, UserHandle user) {

        IRemoteAnimationRunner wrapper = new IRemoteAnimationRunner.Stub() {

            @Override

            public void onAnimationStart(@WindowManager.TransitionOldType int transit,

                    RemoteAnimationTarget[] apps,

                    RemoteAnimationTarget[] wallpapers,

                    RemoteAnimationTarget[] nonApps,

                    final IRemoteAnimationFinishedCallback finishedCallback) {

                try {

                    finishedCallback.onAnimationFinished();

                } catch (RemoteException e) {

                    Slog.e(TAG, "Failed to invoke onAnimationFinished", e);

                }

                final WindowContainerTransaction evictWct = new WindowContainerTransaction();

                mStageCoordinator.prepareEvictNonOpeningChildTasks(position, apps, evictWct);

                mSyncQueue.queue(evictWct);

            }

            @Override

            public void onAnimationCancelled(boolean isKeyguardOccluded) {

            }

        };

        options = mStageCoordinator.resolveStartStage(STAGE_TYPE_UNDEFINED, position, options,

                null /* wct */);

        final WindowContainerTransaction evictWct = new WindowContainerTransaction();

        mStageCoordinator.prepareEvictChildTasks(position, evictWct);

        RemoteAnimationAdapter wrappedAdapter = new RemoteAnimationAdapter(wrapper,

                0 /* duration */, 0 /* statusBarTransitionDelay */);

        ActivityOptions activityOptions = ActivityOptions.fromBundle(options);

        activityOptions.update(ActivityOptions.makeRemoteAnimation(wrappedAdapter));



        try {

            LauncherApps launcherApps =

                    mContext.getSystemService(LauncherApps.class);

            LauncherApps launcherApps = mContext.getSystemService(LauncherApps.class);

            launcherApps.startShortcut(packageName, shortcutId, null /* sourceBounds */,

                    options, user);

            mSyncQueue.queue(evictWct);

                    activityOptions.toBundle(), user);

        } catch (ActivityNotFoundException e) {

            Slog.e(TAG, "Failed to launch shortcut", e);

        }

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+9 −0
Original line number Diff line number Diff line
@@ -610,6 +610,15 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
        }

    }



    void prepareEvictNonOpeningChildTasks(@SplitPosition int position, RemoteAnimationTarget[] apps,

            WindowContainerTransaction wct) {

        if (position == mSideStagePosition) {

            mSideStage.evictNonOpeningChildren(apps, wct);

        } else {

            mMainStage.evictNonOpeningChildren(apps, wct);

        }

    }



    void prepareEvictInvisibleChildTasks(WindowContainerTransaction wct) {

        mMainStage.evictInvisibleChildren(wct);

        mSideStage.evictInvisibleChildren(wct);

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java

+15 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.app.ActivityTaskManager.INVALID_TASK_ID; 
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.view.RemoteAnimationTarget.MODE_OPENING;



import static com.android.wm.shell.common.split.SplitScreenConstants.CONTROLLED_ACTIVITY_TYPES;

import static com.android.wm.shell.common.split.SplitScreenConstants.CONTROLLED_WINDOWING_MODES_WHEN_ACTIVE;
@@ -33,6 +34,7 @@ import android.graphics.Point; 
import android.graphics.Rect;

import android.os.IBinder;

import android.util.SparseArray;

import android.view.RemoteAnimationTarget;

import android.view.SurfaceControl;

import android.view.SurfaceSession;

import android.window.WindowContainerToken;
@@ -334,6 +336,19 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { 
        }

    }



    void evictNonOpeningChildren(RemoteAnimationTarget[] apps, WindowContainerTransaction wct) {

        final SparseArray<ActivityManager.RunningTaskInfo> toBeEvict = mChildrenTaskInfo.clone();

        for (int i = 0; i < apps.length; i++) {

            if (apps[i].mode == MODE_OPENING) {

                toBeEvict.remove(apps[i].taskId);

            }

        }

        for (int i = toBeEvict.size() - 1; i >= 0; i--) {

            final ActivityManager.RunningTaskInfo taskInfo = toBeEvict.valueAt(i);

            wct.reparent(taskInfo.token, null /* parent */, false /* onTop */);

        }

    }



    void evictInvisibleChildren(WindowContainerTransaction wct) {

        for (int i = mChildrenTaskInfo.size() - 1; i >= 0; i--) {

            final ActivityManager.RunningTaskInfo taskInfo = mChildrenTaskInfo.valueAt(i);