Merge "Each displays can have individual app transition." (ae3c76df) · Commits · e / os / android_frameworks_base

config/boot-image-profile.txt

+1 −8

Original line number	Diff line number	Diff line
		@@ -13145,7 +13145,7 @@ HSPLandroid/app/ActivityManagerInternal;->notifyAppTransitionCancelled()V
		HSPLandroid/app/ActivityManagerInternal;->notifyAppTransitionFinished()V
		HSPLandroid/app/ActivityManagerInternal;->notifyAppTransitionStarting(Landroid/util/SparseIntArray;J)V
		HSPLandroid/app/ActivityManagerInternal;->notifyDockedStackMinimizedChanged(Z)V
		HSPLandroid/app/ActivityManagerInternal;->notifyKeyguardFlagsChanged(Ljava/lang/Runnable;)V
		HSPLandroid/app/ActivityManagerInternal;->notifyKeyguardFlagsChanged(Ljava/lang/Runnable;I)V
		HSPLandroid/app/ActivityManagerInternal;->notifyKeyguardTrustedChanged()V
		HSPLandroid/app/ActivityManagerInternal;->notifyNetworkPolicyRulesUpdated(IJ)V
		HSPLandroid/app/ActivityManagerInternal;->onLocalVoiceInteractionStarted(Landroid/os/IBinder;Landroid/service/voice/IVoiceInteractionSession;Lcom/android/internal/app/IVoiceInteractor;)V
		@@ -32750,15 +32750,8 @@ HSPLandroid/view/IWindowManager;->isViewServerRunning()Z
		HSPLandroid/view/IWindowManager;->isWindowTraceEnabled()Z
		HSPLandroid/view/IWindowManager;->lockNow(Landroid/os/Bundle;)V
		HSPLandroid/view/IWindowManager;->openSession(Landroid/view/IWindowSessionCallback;Lcom/android/internal/view/IInputMethodClient;Lcom/android/internal/view/IInputContext;)Landroid/view/IWindowSession;
		HSPLandroid/view/IWindowManager;->overridePendingAppTransition(Ljava/lang/String;IILandroid/os/IRemoteCallback;)V
		HSPLandroid/view/IWindowManager;->overridePendingAppTransitionAspectScaledThumb(Landroid/graphics/GraphicBuffer;IIIILandroid/os/IRemoteCallback;Z)V
		HSPLandroid/view/IWindowManager;->overridePendingAppTransitionClipReveal(IIII)V
		HSPLandroid/view/IWindowManager;->overridePendingAppTransitionInPlace(Ljava/lang/String;I)V
		HSPLandroid/view/IWindowManager;->overridePendingAppTransitionMultiThumb([Landroid/view/AppTransitionAnimationSpec;Landroid/os/IRemoteCallback;Landroid/os/IRemoteCallback;Z)V
		HSPLandroid/view/IWindowManager;->overridePendingAppTransitionMultiThumbFuture(Landroid/view/IAppTransitionAnimationSpecsFuture;Landroid/os/IRemoteCallback;Z)V
		HSPLandroid/view/IWindowManager;->overridePendingAppTransitionRemote(Landroid/view/RemoteAnimationAdapter;)V
		HSPLandroid/view/IWindowManager;->overridePendingAppTransitionScaleUp(IIII)V
		HSPLandroid/view/IWindowManager;->overridePendingAppTransitionThumb(Landroid/graphics/GraphicBuffer;IILandroid/os/IRemoteCallback;Z)V
		HSPLandroid/view/IWindowManager;->prepareAppTransition(IZ)V
		HSPLandroid/view/IWindowManager;->reenableKeyguard(Landroid/os/IBinder;)V
		HSPLandroid/view/IWindowManager;->refreshScreenCaptureDisabled(I)V

config/hiddenapi-light-greylist.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -1418,7 +1418,6 @@ Landroid/view/IWindowManager;->getBaseDisplaySize(ILandroid/graphics/Point;)V
		Landroid/view/IWindowManager;->getDockedStackSide()I
		Landroid/view/IWindowManager;->getInitialDisplayDensity(I)I
		Landroid/view/IWindowManager;->getInitialDisplaySize(ILandroid/graphics/Point;)V
		Landroid/view/IWindowManager;->getPendingAppTransition()I
		Landroid/view/IWindowManager;->hasNavigationBar()Z
		Landroid/view/IWindowManager;->isKeyguardLocked()Z
		Landroid/view/IWindowManager;->isKeyguardSecure()Z

core/java/android/view/IWindowManager.aidl

+0 −23

Original line number	Diff line number	Diff line
		@@ -88,29 +88,6 @@ interface IWindowManager
		void addWindowToken(IBinder token, int type, int displayId);
		void removeWindowToken(IBinder token, int displayId);
		void prepareAppTransition(int transit, boolean alwaysKeepCurrent);
		int getPendingAppTransition();
		void overridePendingAppTransition(String packageName, int enterAnim, int exitAnim,
		IRemoteCallback startedCallback);
		void overridePendingAppTransitionScaleUp(int startX, int startY, int startWidth,
		int startHeight);
		void overridePendingAppTransitionClipReveal(int startX, int startY,
		int startWidth, int startHeight);
		void overridePendingAppTransitionThumb(in GraphicBuffer srcThumb, int startX, int startY,
		IRemoteCallback startedCallback, boolean scaleUp);
		void overridePendingAppTransitionAspectScaledThumb(in GraphicBuffer srcThumb, int startX,
		int startY, int targetWidth, int targetHeight, IRemoteCallback startedCallback,
		boolean scaleUp);
		/**
		* Overrides animation for app transition that exits from an application to a multi-window
		* environment and allows specifying transition animation parameters for each window.
		*
		* @param specs Array of transition animation descriptions for entering windows.
		*
		* @hide
		*/
		void overridePendingAppTransitionMultiThumb(in AppTransitionAnimationSpec[] specs,
		IRemoteCallback startedCallback, IRemoteCallback finishedCallback, boolean scaleUp);
		void overridePendingAppTransitionInPlace(String packageName, int anim);

		/**
		* Like overridePendingAppTransitionMultiThumb, but uses a future to supply the specs. This is

core/proto/android/server/windowmanagerservice.proto

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ message WindowManagerServiceDumpProto {
		optional bool display_frozen = 6;
		optional int32 rotation = 7;
		optional int32 last_orientation = 8;
		optional AppTransitionProto app_transition = 9;
		}

		/* represents RootWindowContainer object */
		@@ -159,6 +158,7 @@ message DisplayContentProto {
		optional DisplayFramesProto display_frames = 13;
		optional int32 surface_size = 14;
		optional string focused_app = 15;
		optional AppTransitionProto app_transition = 16;
		}

		/* represents DisplayFrames */

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

+3 −100

Original line number	Diff line number	Diff line
		@@ -18,16 +18,7 @@ package com.android.server.am;

		import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
		import static android.app.ActivityManager.TaskDescription.ATTR_TASKDESCRIPTION_PREFIX;
		import static android.app.ActivityOptions.ANIM_CLIP_REVEAL;
		import static android.app.ActivityOptions.ANIM_CUSTOM;
		import static android.app.ActivityOptions.ANIM_OPEN_CROSS_PROFILE_APPS;
		import static android.app.ActivityOptions.ANIM_REMOTE_ANIMATION;
		import static android.app.ActivityOptions.ANIM_SCALE_UP;
		import static android.app.ActivityOptions.ANIM_SCENE_TRANSITION;
		import static android.app.ActivityOptions.ANIM_THUMBNAIL_ASPECT_SCALE_DOWN;
		import static android.app.ActivityOptions.ANIM_THUMBNAIL_ASPECT_SCALE_UP;
		import static android.app.ActivityOptions.ANIM_THUMBNAIL_SCALE_DOWN;
		import static android.app.ActivityOptions.ANIM_THUMBNAIL_SCALE_UP;
		import static android.app.ActivityTaskManager.INVALID_STACK_ID;
		import static android.app.AppOpsManager.MODE_ALLOWED;
		import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE;
		@@ -156,7 +147,6 @@ import android.content.pm.ApplicationInfo;
		import android.content.res.CompatibilityInfo;
		import android.content.res.Configuration;
		import android.graphics.Bitmap;
		import android.graphics.GraphicBuffer;
		import android.graphics.Rect;
		import android.os.Binder;
		import android.os.Build;
		@@ -177,8 +167,6 @@ import android.util.MergedConfiguration;
		import android.util.Slog;
		import android.util.TimeUtils;
		import android.util.proto.ProtoOutputStream;
		import android.view.AppTransitionAnimationSpec;
		import android.view.IAppTransitionAnimationSpecsFuture;
		import android.view.IApplicationToken;
		import android.view.RemoteAnimationDefinition;
		import android.view.WindowManager.LayoutParams;
		@@ -1502,93 +1490,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
		void applyOptionsLocked() {
		if (pendingOptions != null
		&& pendingOptions.getAnimationType() != ANIM_SCENE_TRANSITION) {
		final int animationType = pendingOptions.getAnimationType();
		switch (animationType) {
		case ANIM_CUSTOM:
		service.mWindowManager.overridePendingAppTransition(
		pendingOptions.getPackageName(),
		pendingOptions.getCustomEnterResId(),
		pendingOptions.getCustomExitResId(),
		pendingOptions.getOnAnimationStartListener());
		break;
		case ANIM_CLIP_REVEAL:
		service.mWindowManager.overridePendingAppTransitionClipReveal(
		pendingOptions.getStartX(), pendingOptions.getStartY(),
		pendingOptions.getWidth(), pendingOptions.getHeight());
		if (intent.getSourceBounds() == null) {
		intent.setSourceBounds(new Rect(pendingOptions.getStartX(),
		pendingOptions.getStartY(),
		pendingOptions.getStartX()+pendingOptions.getWidth(),
		pendingOptions.getStartY()+pendingOptions.getHeight()));
		}
		break;
		case ANIM_SCALE_UP:
		service.mWindowManager.overridePendingAppTransitionScaleUp(
		pendingOptions.getStartX(), pendingOptions.getStartY(),
		pendingOptions.getWidth(), pendingOptions.getHeight());
		if (intent.getSourceBounds() == null) {
		intent.setSourceBounds(new Rect(pendingOptions.getStartX(),
		pendingOptions.getStartY(),
		pendingOptions.getStartX()+pendingOptions.getWidth(),
		pendingOptions.getStartY()+pendingOptions.getHeight()));
		}
		break;
		case ANIM_THUMBNAIL_SCALE_UP:
		case ANIM_THUMBNAIL_SCALE_DOWN:
		final boolean scaleUp = (animationType == ANIM_THUMBNAIL_SCALE_UP);
		final GraphicBuffer buffer = pendingOptions.getThumbnail();
		service.mWindowManager.overridePendingAppTransitionThumb(buffer,
		pendingOptions.getStartX(), pendingOptions.getStartY(),
		pendingOptions.getOnAnimationStartListener(),
		scaleUp);
		if (intent.getSourceBounds() == null && buffer != null) {
		intent.setSourceBounds(new Rect(pendingOptions.getStartX(),
		pendingOptions.getStartY(),
		pendingOptions.getStartX() + buffer.getWidth(),
		pendingOptions.getStartY() + buffer.getHeight()));
		}
		break;
		case ANIM_THUMBNAIL_ASPECT_SCALE_UP:
		case ANIM_THUMBNAIL_ASPECT_SCALE_DOWN:
		final AppTransitionAnimationSpec[] specs = pendingOptions.getAnimSpecs();
		final IAppTransitionAnimationSpecsFuture specsFuture =
		pendingOptions.getSpecsFuture();
		if (specsFuture != null) {
		service.mWindowManager.overridePendingAppTransitionMultiThumbFuture(
		specsFuture, pendingOptions.getOnAnimationStartListener(),
		animationType == ANIM_THUMBNAIL_ASPECT_SCALE_UP);
		} else if (animationType == ANIM_THUMBNAIL_ASPECT_SCALE_DOWN
		&& specs != null) {
		service.mWindowManager.overridePendingAppTransitionMultiThumb(
		specs, pendingOptions.getOnAnimationStartListener(),
		pendingOptions.getAnimationFinishedListener(), false);
		} else {
		service.mWindowManager.overridePendingAppTransitionAspectScaledThumb(
		pendingOptions.getThumbnail(),
		pendingOptions.getStartX(), pendingOptions.getStartY(),
		pendingOptions.getWidth(), pendingOptions.getHeight(),
		pendingOptions.getOnAnimationStartListener(),
		(animationType == ANIM_THUMBNAIL_ASPECT_SCALE_UP));
		if (intent.getSourceBounds() == null) {
		intent.setSourceBounds(new Rect(pendingOptions.getStartX(),
		pendingOptions.getStartY(),
		pendingOptions.getStartX() + pendingOptions.getWidth(),
		pendingOptions.getStartY() + pendingOptions.getHeight()));
		}
		}
		break;
		case ANIM_OPEN_CROSS_PROFILE_APPS:
		service.mWindowManager.overridePendingAppTransitionStartCrossProfileApps();
		break;
		case ANIM_REMOTE_ANIMATION:
		service.mWindowManager.overridePendingAppTransitionRemote(
		pendingOptions.getRemoteAnimationAdapter());
		break;
		default:
		Slog.e(TAG, "applyOptionsLocked: Unknown animationType=" + animationType);
		break;
		}

		mWindowContainerController.applyOptionsLocked(pendingOptions, intent);
		if (task == null) {
		clearOptionsLocked(false /* withAbort */);
		} else {
		@@ -2768,7 +2670,8 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
		preserveWindow);
		final ActivityLifecycleItem lifecycleItem;
		if (andResume) {
		lifecycleItem = ResumeActivityItem.obtain(service.isNextTransitionForward());
		lifecycleItem = ResumeActivityItem.obtain(
		getDisplay().getWindowContainerController().isNextTransitionForward());
		} else {
		lifecycleItem = PauseActivityItem.obtain();
		}