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

Commit a04c532a authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'recents_transition' into nyc-dev 

* changes:
  Implement transition for docking task in recents #6
  Implement transition for docking task in recents #5
  Implement transition for docking task in recents #4
  Implement transition for docking task in recents #3
  Implement transition for docking task in recents #2
  Implement transition for docking task in recents #1
  Show a scrim activity if task is not resizable
parents d0ee17d9 c69bd224

core/java/android/animation/KeyframeSet.java

+2 −1
Original line number Diff line number Diff line
@@ -29,8 +29,9 @@ import android.util.Log; 
 * This class holds a collection of Keyframe objects and is called by ValueAnimator to calculate

 * values between those keyframes for a given animation. The class internal to the animation

 * package because it is an implementation detail of how Keyframes are stored and used.

 * @hide

 */

class KeyframeSet implements Keyframes {

public class KeyframeSet implements Keyframes {



    int mNumKeyframes;

core/java/android/animation/Keyframes.java

+2 −1
Original line number Diff line number Diff line
@@ -20,8 +20,9 @@ import java.util.List; 
/**

 * This interface abstracts a collection of Keyframe objects and is called by

 * ValueAnimator to calculate values between those keyframes for a given animation.

 * @hide

 */

interface Keyframes extends Cloneable {

public interface Keyframes extends Cloneable {



    /**

     * Sets the TypeEvaluator to be used when calculating animated values. This object

core/java/android/animation/PathKeyframes.java

+2 −1
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ import java.util.ArrayList; 
 * Typically, the returned type is a PointF, but the individual components can be extracted

 * as either an IntKeyframes or FloatKeyframes.

 * </p>

 * @hide

 */

class PathKeyframes implements Keyframes {

public class PathKeyframes implements Keyframes {

    private static final int FRACTION_OFFSET = 0;

    private static final int X_OFFSET = 1;

    private static final int Y_OFFSET = 2;

core/java/android/app/ActivityManagerInternal.java

+11 −0
Original line number Diff line number Diff line
@@ -114,4 +114,15 @@ public abstract class ActivityManagerInternal { 
     *               values.

     */

    public abstract void notifyAppTransitionStarting(int reason);



    /**

     * Callback for window manager to let activity manager know that the app transition was

     * cancelled.

     */

    public abstract void notifyAppTransitionCancelled();



    /**

     * Callback for window manager to let activity manager know that the app transition is finished.

     */

    public abstract void notifyAppTransitionFinished();

}

core/java/android/app/ActivityOptions.java

+24 −0
Original line number Diff line number Diff line
@@ -153,6 +153,12 @@ public class ActivityOptions { 
     */

    private static final String KEY_LAUNCH_STACK_ID = "android.activity.launchStackId";



    /**

     * The task id the activity should be launched into.

     * @hide

     */

    private static final String KEY_LAUNCH_TASK_ID = "android.activity.launchTaskId";



    /**

     * Where the docked stack should be positioned.

     * @hide
@@ -224,6 +230,7 @@ public class ActivityOptions { 
    private int mExitCoordinatorIndex;

    private PendingIntent mUsageTimeReport;

    private int mLaunchStackId = INVALID_STACK_ID;

    private int mLaunchTaskId = -1;

    private int mDockCreateMode = DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT;

    private AppTransitionAnimationSpec mAnimSpecs[];
@@ -766,6 +773,7 @@ public class ActivityOptions { 
                break;

        }

        mLaunchStackId = opts.getInt(KEY_LAUNCH_STACK_ID, INVALID_STACK_ID);

        mLaunchTaskId = opts.getInt(KEY_LAUNCH_TASK_ID, -1);

        mDockCreateMode = opts.getInt(KEY_DOCK_CREATE_MODE, DOCKED_STACK_CREATE_MODE_TOP_OR_LEFT);

        if (opts.containsKey(KEY_ANIM_SPECS)) {

            Parcelable[] specs = opts.getParcelableArray(KEY_ANIM_SPECS);
@@ -927,6 +935,21 @@ public class ActivityOptions { 
        mLaunchStackId = launchStackId;

    }



    /**

     * Sets the task the activity will be launched in.

     * @hide

     */

    public void setLaunchTaskId(int taskId) {

        mLaunchTaskId = taskId;

    }



    /**

     * @hide

     */

    public int getLaunchTaskId() {

        return mLaunchTaskId;

    }



    /** @hide */

    public int getDockCreateMode() {

        return mDockCreateMode;
@@ -1079,6 +1102,7 @@ public class ActivityOptions { 
                break;

        }

        b.putInt(KEY_LAUNCH_STACK_ID, mLaunchStackId);

        b.putInt(KEY_LAUNCH_TASK_ID, mLaunchTaskId);

        b.putInt(KEY_DOCK_CREATE_MODE, mDockCreateMode);

        if (mAnimSpecs != null) {

            b.putParcelableArray(KEY_ANIM_SPECS, mAnimSpecs);