Merge "Remove unused old transition types" into main (5c9d2f47) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManager.java

+0 −81

Original line number	Diff line number	Diff line
		@@ -221,13 +221,6 @@ public interface WindowManager extends ViewManager {
		*/
		int TRANSIT_OLD_TASK_OPEN = 8;

		/**
		* A window in the top-most activity is being closed to reveal the previous activity in a
		* different task.
		* @hide
		*/
		int TRANSIT_OLD_TASK_CLOSE = 9;

		/**
		* A window in an existing task is being displayed on top of an existing one in another
		* activity's task.
		@@ -255,33 +248,6 @@ public interface WindowManager extends ViewManager {
		*/
		int TRANSIT_OLD_WALLPAPER_OPEN = 13;

		/**
		* A window in a new activity is being opened on top of an existing one, and both are on top
		* of the wallpaper.
		* @hide
		*/
		int TRANSIT_OLD_WALLPAPER_INTRA_OPEN = 14;

		/**
		* The window in the top-most activity is being closed to reveal the previous activity, and
		* both are on top of the wallpaper.
		* @hide
		*/
		int TRANSIT_OLD_WALLPAPER_INTRA_CLOSE = 15;

		/**
		* A window in a new task is being opened behind an existing one in another activity's task.
		* The new window will show briefly and then be gone.
		* @hide
		*/
		int TRANSIT_OLD_TASK_OPEN_BEHIND = 16;

		/**
		* An activity is being relaunched (e.g. due to configuration change).
		* @hide
		*/
		int TRANSIT_OLD_ACTIVITY_RELAUNCH = 18;

		/**
		* Keyguard is going away.
		* @hide
		@@ -312,30 +278,6 @@ public interface WindowManager extends ViewManager {
		*/
		int TRANSIT_OLD_KEYGUARD_UNOCCLUDE = 23;

		/**
		* A translucent activity is being opened.
		* @hide
		*/
		int TRANSIT_OLD_TRANSLUCENT_ACTIVITY_OPEN = 24;

		/**
		* A translucent activity is being closed.
		* @hide
		*/
		int TRANSIT_OLD_TRANSLUCENT_ACTIVITY_CLOSE = 25;

		/**
		* A crashing activity is being closed.
		* @hide
		*/
		int TRANSIT_OLD_CRASHING_ACTIVITY_CLOSE = 26;

		/**
		* A task is changing windowing modes
		* @hide
		*/
		int TRANSIT_OLD_TASK_CHANGE_WINDOWING_MODE = 27;

		/**
		* A window in a new task fragment is being opened.
		* @hide
		@@ -355,18 +297,6 @@ public interface WindowManager extends ViewManager {
		*/
		int TRANSIT_OLD_TASK_FRAGMENT_CHANGE = 30;

		/**
		* A dream activity is being opened.
		* @hide
		*/
		int TRANSIT_OLD_DREAM_ACTIVITY_OPEN = 31;

		/**
		* A dream activity is being closed.
		* @hide
		*/
		int TRANSIT_OLD_DREAM_ACTIVITY_CLOSE = 32;

		/**
		* @hide
		*/
		@@ -376,28 +306,17 @@ public interface WindowManager extends ViewManager {
		TRANSIT_OLD_ACTIVITY_OPEN,
		TRANSIT_OLD_ACTIVITY_CLOSE,
		TRANSIT_OLD_TASK_OPEN,
		TRANSIT_OLD_TASK_CLOSE,
		TRANSIT_OLD_TASK_TO_FRONT,
		TRANSIT_OLD_TASK_TO_BACK,
		TRANSIT_OLD_WALLPAPER_CLOSE,
		TRANSIT_OLD_WALLPAPER_OPEN,
		TRANSIT_OLD_WALLPAPER_INTRA_OPEN,
		TRANSIT_OLD_WALLPAPER_INTRA_CLOSE,
		TRANSIT_OLD_TASK_OPEN_BEHIND,
		TRANSIT_OLD_ACTIVITY_RELAUNCH,
		TRANSIT_OLD_KEYGUARD_GOING_AWAY,
		TRANSIT_OLD_KEYGUARD_GOING_AWAY_ON_WALLPAPER,
		TRANSIT_OLD_KEYGUARD_OCCLUDE,
		TRANSIT_OLD_KEYGUARD_UNOCCLUDE,
		TRANSIT_OLD_TRANSLUCENT_ACTIVITY_OPEN,
		TRANSIT_OLD_TRANSLUCENT_ACTIVITY_CLOSE,
		TRANSIT_OLD_CRASHING_ACTIVITY_CLOSE,
		TRANSIT_OLD_TASK_CHANGE_WINDOWING_MODE,
		TRANSIT_OLD_TASK_FRAGMENT_OPEN,
		TRANSIT_OLD_TASK_FRAGMENT_CLOSE,
		TRANSIT_OLD_TASK_FRAGMENT_CHANGE,
		TRANSIT_OLD_DREAM_ACTIVITY_OPEN,
		TRANSIT_OLD_DREAM_ACTIVITY_CLOSE
		})
		@Retention(RetentionPolicy.SOURCE)
		@interface TransitionOldType {}

core/java/com/android/internal/policy/TransitionAnimation.java

+35 −346

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -321,7 +321,6 @@ import android.view.SurfaceControl.Transaction;
		import android.view.WindowInsets;
		import android.view.WindowManager;
		import android.view.WindowManager.LayoutParams;
		import android.view.WindowManager.TransitionOldType;
		import android.window.ActivityWindowInfo;
		import android.window.ITaskFragmentOrganizer;
		import android.window.RemoteTransition;
		@@ -7190,11 +7189,6 @@ final class ActivityRecord extends WindowToken {
		t.setVisibility(mSurfaceControl, visible);
		}

		public @TransitionOldType int getTransit() {
		return mTransit;
		}


		void registerRemoteAnimations(RemoteAnimationDefinition definition) {
		mRemoteAnimationDefinition = definition;
		if (definition != null) {

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

+2 −4

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ import static android.view.RemoteAnimationTarget.MODE_OPENING;
		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_APP_PROGRESS_GENERATION_ALLOWED;
		import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
		import static android.view.WindowManager.TRANSIT_CHANGE;
		import static android.view.WindowManager.TRANSIT_OLD_NONE;
		import static android.view.WindowManager.TRANSIT_PREPARE_BACK_NAVIGATION;
		import static android.window.DesktopExperienceFlags.ENABLE_INDEPENDENT_BACK_IN_PROJECTED;
		import static android.window.SystemOverrideOnBackInvokedCallback.OVERRIDE_FINISH_AND_REMOVE_TASK;
		@@ -729,11 +728,10 @@ class BackNavigationController {
		final int attr = com.android.internal.R.styleable
		.WindowAnimation_activityCloseExitAnimation;
		final int appResId = transitionAnimation.getAnimationResId(
		window.mAttrs, attr, TRANSIT_OLD_NONE);
		window.mAttrs, attr);
		if (ResourceId.isValid(appResId)) {
		if (sDefaultAnimationResId == 0) {
		sDefaultAnimationResId = transitionAnimation.getDefaultAnimationResId(attr,
		TRANSIT_OLD_NONE);
		sDefaultAnimationResId = transitionAnimation.getDefaultAnimationResId(attr);
		}
		return sDefaultAnimationResId != appResId;
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4644,7 +4644,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		t.show(mSurface);
		if (DEBUG_IME_VISIBILITY) {
		EventLog.writeEvent(IMF_SHOW_IME_SCREENSHOT, mImeTarget.toString(),
		dc.mInputMethodWindow.mTransitFlags, mSurfacePosition.toString());
		0 /* unused transition flags */, mSurfacePosition.toString());
		}
		} else if (!isValid) {
		removeSurface(t);