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

Commit 66f0026f authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes from topics "reland_recents_animation", " reland_recents_animation" 

* changes:
  Fix issue with reparenting stacks on displays.
  Revert "Revert "4/ Update SysUI shared lib for Recents transition""
  Revert "Revert "3/ Add input consumer to capture touches during a Recents transition""
  Revert "Revert "2/ Add support for remote Recents animation""
  Revert "Revert "1/ Create display content window controller to position stacks in the display""
parents 17546a7e f34c6021

Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -332,6 +332,8 @@ java_library { 
        "core/java/android/view/IPinnedStackController.aidl",

        "core/java/android/view/IPinnedStackListener.aidl",

        "core/java/android/view/IRemoteAnimationRunner.aidl",

        "core/java/android/view/IRecentsAnimationController.aidl",

        "core/java/android/view/IRecentsAnimationRunner.aidl",

        "core/java/android/view/IRemoteAnimationFinishedCallback.aidl",

        "core/java/android/view/IRotationWatcher.aidl",

        "core/java/android/view/IWallpaperVisibilityListener.aidl",

core/java/android/app/ActivityOptions.java

+28 −0
Original line number Diff line number Diff line
@@ -206,6 +206,12 @@ public class ActivityOptions { 
    private static final String KEY_TASK_OVERLAY_CAN_RESUME =

            "android.activity.taskOverlayCanResume";



    /**

     * See {@link #setAvoidMoveToFront()}.

     * @hide

     */

    private static final String KEY_AVOID_MOVE_TO_FRONT = "android.activity.avoidMoveToFront";



    /**

     * Where the split-screen-primary stack should be positioned.

     * @hide
@@ -307,6 +313,7 @@ public class ActivityOptions { 
    private boolean mDisallowEnterPictureInPictureWhileLaunching;

    private boolean mTaskOverlay;

    private boolean mTaskOverlayCanResume;

    private boolean mAvoidMoveToFront;

    private AppTransitionAnimationSpec mAnimSpecs[];

    private int mRotationAnimationHint = -1;

    private Bundle mAppVerificationBundle;
@@ -923,6 +930,7 @@ public class ActivityOptions { 
        mLaunchTaskId = opts.getInt(KEY_LAUNCH_TASK_ID, -1);

        mTaskOverlay = opts.getBoolean(KEY_TASK_OVERLAY, false);

        mTaskOverlayCanResume = opts.getBoolean(KEY_TASK_OVERLAY_CAN_RESUME, false);

        mAvoidMoveToFront = opts.getBoolean(KEY_AVOID_MOVE_TO_FRONT, false);

        mSplitScreenCreateMode = opts.getInt(KEY_SPLIT_SCREEN_CREATE_MODE,

                SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT);

        mDisallowEnterPictureInPictureWhileLaunching = opts.getBoolean(
@@ -1239,6 +1247,25 @@ public class ActivityOptions { 
        return mTaskOverlayCanResume;

    }



    /**

     * Sets whether the activity launched should not cause the activity stack it is contained in to

     * be moved to the front as a part of launching.

     *

     * @hide

     */

    public void setAvoidMoveToFront() {

        mAvoidMoveToFront = true;

    }



    /**

     * @return whether the activity launch should prevent moving the associated activity stack to

     *         the front.

     * @hide

     */

    public boolean getAvoidMoveToFront() {

        return mAvoidMoveToFront;

    }



    /** @hide */

    public int getSplitScreenCreateMode() {

        return mSplitScreenCreateMode;
@@ -1416,6 +1443,7 @@ public class ActivityOptions { 
        b.putInt(KEY_LAUNCH_TASK_ID, mLaunchTaskId);

        b.putBoolean(KEY_TASK_OVERLAY, mTaskOverlay);

        b.putBoolean(KEY_TASK_OVERLAY_CAN_RESUME, mTaskOverlayCanResume);

        b.putBoolean(KEY_AVOID_MOVE_TO_FRONT, mAvoidMoveToFront);

        b.putInt(KEY_SPLIT_SCREEN_CREATE_MODE, mSplitScreenCreateMode);

        b.putBoolean(KEY_DISALLOW_ENTER_PICTURE_IN_PICTURE_WHILE_LAUNCHING,

                mDisallowEnterPictureInPictureWhileLaunching);

core/java/android/app/IActivityManager.aidl

+4 −2
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import android.os.PersistableBundle; 
import android.os.StrictMode;

import android.os.WorkSource;

import android.service.voice.IVoiceInteractionSession;

import android.view.IRecentsAnimationRunner;

import android.view.RemoteAnimationDefinition;

import com.android.internal.app.IVoiceInteractor;

import com.android.internal.os.IResultReceiver;
@@ -443,8 +444,9 @@ interface IActivityManager { 
            in Bundle options, int userId);

    int startAssistantActivity(in String callingPackage, int callingPid, int callingUid,

            in Intent intent, in String resolvedType, in Bundle options, int userId);

    int startRecentsActivity(in IAssistDataReceiver assistDataReceiver, in Bundle options,

            in Bundle activityOptions, int userId);

    void startRecentsActivity(in Intent intent, in IAssistDataReceiver assistDataReceiver,

            in IRecentsAnimationRunner recentsAnimationRunner);

    void cancelRecentsAnimation();

    int startActivityFromRecents(int taskId, in Bundle options);

    Bundle getActivityOptions(in IBinder token);

    List<IBinder> getAppTasks(in String callingPackage);

core/java/android/view/IRecentsAnimationController.aidl

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.view;



import android.app.ActivityManager;

import android.view.IRemoteAnimationFinishedCallback;

import android.graphics.GraphicBuffer;



/**

 * Passed to the {@link IRecentsAnimationRunner} in order for the runner to control to let the

 * runner control certain aspects of the recents animation, and to notify window manager when the

 * animation has completed.

 *

 * {@hide}

 */

interface IRecentsAnimationController {



    /**

     * Takes a screenshot of the task associated with the given {@param taskId}. Only valid for the

     * current set of task ids provided to the handler.

     */

    ActivityManager.TaskSnapshot screenshotTask(int taskId);



    /**

     * Notifies to the system that the animation into Recents should end, and all leashes associated

     * with remote animation targets should be relinquished. If {@param moveHomeToTop} is true, then

     * the home activity should be moved to the top. Otherwise, the home activity is hidden and the

     * user is returned to the app.

     */

    void finish(boolean moveHomeToTop);



    /**

     * Called by the handler to indicate that the recents animation input consumer should be

     * enabled. This is currently used to work around an issue where registering an input consumer

     * mid-animation causes the existing motion event chain to be canceled. Instead, the caller

     * may register the recents animation input consumer prior to starting the recents animation

     * and then enable it mid-animation to start receiving touch events.

     */

    void setInputConsumerEnabled(boolean enabled);

}

core/java/android/view/IRecentsAnimationRunner.aidl

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.view;



import android.view.RemoteAnimationTarget;

import android.view.IRecentsAnimationController;



/**

 * Interface that is used to callback from window manager to the process that runs a recents

 * animation to start or cancel it.

 *

 * {@hide}

 */

oneway interface IRecentsAnimationRunner {



    /**

     * Called when the system is ready for the handler to start animating all the visible tasks.

     */

    void onAnimationStart(in IRecentsAnimationController controller,

            in RemoteAnimationTarget[] apps);



    /**

     * Called when the system needs to cancel the current animation. This can be due to the

     * wallpaper not drawing in time, or the handler not finishing the animation within a predefined

     * amount of time.

     */

    void onAnimationCanceled();

}