Merge "Add test APIs for makeCustomAnimation" into rvc-dev am: 49ccdb557f (10e100c0) · Commits · e / os / android_frameworks_base

api/test-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ package android.app {
		}

		public class ActivityOptions {
		method @NonNull public static android.app.ActivityOptions makeCustomAnimation(@NonNull android.content.Context, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener);
		method public static void setExitTransitionTimeout(long);
		method public void setLaunchActivityType(int);
		method public void setLaunchTaskId(int);
		@@ -115,6 +116,14 @@ package android.app {
		method public void setTaskOverlay(boolean, boolean);
		}

		public static interface ActivityOptions.OnAnimationFinishedListener {
		method public void onAnimationFinished();
		}

		public static interface ActivityOptions.OnAnimationStartedListener {
		method public void onAnimationStarted();
		}

		public class ActivityTaskManager {
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public void clearLaunchParamsForPackages(java.util.List<java.lang.String>);
		method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_STACKS) public String listAllStacks();

core/java/android/app/ActivityOptions.java

+37 −2

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
		import static android.view.Display.INVALID_DISPLAY;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.RequiresPermission;
		import android.annotation.TestApi;
		@@ -379,7 +380,7 @@ public class ActivityOptions {
		*/
		public static ActivityOptions makeCustomAnimation(Context context,
		int enterResId, int exitResId) {
		return makeCustomAnimation(context, enterResId, exitResId, null, null);
		return makeCustomAnimation(context, enterResId, exitResId, null, null, null);
		}

		/**
		@@ -413,6 +414,38 @@ public class ActivityOptions {
		return opts;
		}

		/**
		* Create an ActivityOptions specifying a custom animation to run when
		* the activity is displayed.
		*
		* @param context Who is defining this. This is the application that the
		* animation resources will be loaded from.
		* @param enterResId A resource ID of the animation resource to use for
		* the incoming activity. Use 0 for no animation.
		* @param exitResId A resource ID of the animation resource to use for
		* the outgoing activity. Use 0 for no animation.
		* @param handler If <var>listener</var> is non-null this must be a valid
		* Handler on which to dispatch the callback; otherwise it should be null.
		* @param startedListener Optional OnAnimationStartedListener to find out when the
		* requested animation has started running. If for some reason the animation
		* is not executed, the callback will happen immediately.
		* @param finishedListener Optional OnAnimationFinishedListener when the animation
		* has finished running.
		* @return Returns a new ActivityOptions object that you can use to
		* supply these options as the options Bundle when starting an activity.
		* @hide
		*/
		@TestApi
		public static @NonNull ActivityOptions makeCustomAnimation(@NonNull Context context,
		int enterResId, int exitResId, @Nullable Handler handler,
		@Nullable OnAnimationStartedListener startedListener,
		@Nullable OnAnimationFinishedListener finishedListener) {
		ActivityOptions opts = makeCustomAnimation(context, enterResId, exitResId, handler,
		startedListener);
		opts.setOnAnimationFinishedListener(handler, finishedListener);
		return opts;
		}

		/**
		* Creates an ActivityOptions specifying a custom animation to run in place on an existing
		* activity.
		@@ -458,6 +491,7 @@ public class ActivityOptions {
		* to find out when the given animation has started running.
		* @hide
		*/
		@TestApi
		public interface OnAnimationStartedListener {
		void onAnimationStarted();
		}
		@@ -484,6 +518,7 @@ public class ActivityOptions {
		* to find out when the given animation has drawn its last frame.
		* @hide
		*/
		@TestApi
		public interface OnAnimationFinishedListener {
		void onAnimationFinished();
		}
		@@ -1100,7 +1135,7 @@ public class ActivityOptions {
		}

		/** @hide */
		public IRemoteCallback getOnAnimationStartListener() {
		public IRemoteCallback getAnimationStartedListener() {
		return mAnimationStartedListener;
		}

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ public abstract class ActivityOptionsCompat {
		callbackHandler.post(callback);
		}
		}
		});
		}, null /* finishedListener */);
		}

		/**

services/core/java/com/android/server/wm/ActivityRecord.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -3769,7 +3769,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		pendingOptions.getPackageName(),
		pendingOptions.getCustomEnterResId(),
		pendingOptions.getCustomExitResId(),
		pendingOptions.getOnAnimationStartListener());
		pendingOptions.getAnimationStartedListener(),
		pendingOptions.getAnimationFinishedListener());
		break;
		case ANIM_CLIP_REVEAL:
		displayContent.mAppTransition.overridePendingAppTransitionClipReveal(
		@@ -3799,7 +3800,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		final GraphicBuffer buffer = pendingOptions.getThumbnail();
		displayContent.mAppTransition.overridePendingAppTransitionThumb(buffer,
		pendingOptions.getStartX(), pendingOptions.getStartY(),
		pendingOptions.getOnAnimationStartListener(),
		pendingOptions.getAnimationStartedListener(),
		scaleUp);
		if (intent.getSourceBounds() == null && buffer != null) {
		intent.setSourceBounds(new Rect(pendingOptions.getStartX(),
		@@ -3815,19 +3816,19 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		pendingOptions.getSpecsFuture();
		if (specsFuture != null) {
		displayContent.mAppTransition.overridePendingAppTransitionMultiThumbFuture(
		specsFuture, pendingOptions.getOnAnimationStartListener(),
		specsFuture, pendingOptions.getAnimationStartedListener(),
		animationType == ANIM_THUMBNAIL_ASPECT_SCALE_UP);
		} else if (animationType == ANIM_THUMBNAIL_ASPECT_SCALE_DOWN
		&& specs != null) {
		displayContent.mAppTransition.overridePendingAppTransitionMultiThumb(
		specs, pendingOptions.getOnAnimationStartListener(),
		specs, pendingOptions.getAnimationStartedListener(),
		pendingOptions.getAnimationFinishedListener(), false);
		} else {
		displayContent.mAppTransition.overridePendingAppTransitionAspectScaledThumb(
		pendingOptions.getThumbnail(),
		pendingOptions.getStartX(), pendingOptions.getStartY(),
		pendingOptions.getWidth(), pendingOptions.getHeight(),
		pendingOptions.getOnAnimationStartListener(),
		pendingOptions.getAnimationStartedListener(),
		(animationType == ANIM_THUMBNAIL_ASPECT_SCALE_UP));
		if (intent.getSourceBounds() == null) {
		intent.setSourceBounds(new Rect(pendingOptions.getStartX(),

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2003,7 +2003,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		if (self.isState(
		ActivityStack.ActivityState.RESUMED, ActivityStack.ActivityState.PAUSING)) {
		self.getDisplay().mDisplayContent.mAppTransition.overridePendingAppTransition(
		packageName, enterAnim, exitAnim, null);
		packageName, enterAnim, exitAnim, null, null);
		}

		Binder.restoreCallingIdentity(origId);