Merge "Unstomp TRANSIT_FLAG_APP_CRASHED" into udc-dev (d33e7761) · Commits · e / os / android_frameworks_base

core/java/android/view/WindowManager.java

+18 −18

Original line number	Original line	Diff line number	Diff line
	@@ -495,64 +495,64 @@ public interface WindowManager extends ViewManager {
	* Transition flag: Keyguard is going away, but keeping the notification shade open		* Transition flag: Keyguard is going away, but keeping the notification shade open
	* @hide		* @hide
	*/		*/
	int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE = 0x1;		int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_SHADE = (1 << 0); // 0x1

	/**		/**
	* Transition flag: Keyguard is going away, but doesn't want an animation for it		* Transition flag: Keyguard is going away, but doesn't want an animation for it
	* @hide		* @hide
	*/		*/
	int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION = 0x2;		int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION = (1 << 1); // 0x2

	/**		/**
	* Transition flag: Keyguard is going away while it was showing the system wallpaper.		* Transition flag: Keyguard is going away while it was showing the system wallpaper.
	* @hide		* @hide
	*/		*/
	int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER = 0x4;		int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER = (1 << 2); // 0x4

	/**		/**
	* Transition flag: Keyguard is going away with subtle animation.		* Transition flag: Keyguard is going away with subtle animation.
	* @hide		* @hide
	*/		*/
	int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION = 0x8;		int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION = (1 << 3); // 0x8

	/**
	* Transition flag: Keyguard is going away to the launcher, and it needs us to clear the task
	* snapshot of the launcher because it has changed something in the Launcher window.
	* @hide
	*/
	int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_LAUNCHER_CLEAR_SNAPSHOT = 0x16;

	/**		/**
	* Transition flag: App is crashed.		* Transition flag: App is crashed.
	* @hide		* @hide
	*/		*/
	int TRANSIT_FLAG_APP_CRASHED = 0x10;		int TRANSIT_FLAG_APP_CRASHED = (1 << 4); // 0x10

	/**		/**
	* Transition flag: A window in a new task is being opened behind an existing one in another		* Transition flag: A window in a new task is being opened behind an existing one in another
	* activity's task.		* activity's task.
	* @hide		* @hide
	*/		*/
	int TRANSIT_FLAG_OPEN_BEHIND = 0x20;		int TRANSIT_FLAG_OPEN_BEHIND = (1 << 5); // 0x20

	/**		/**
	* Transition flag: The keyguard is locked throughout the whole transition.		* Transition flag: The keyguard is locked throughout the whole transition.
	* @hide		* @hide
	*/		*/
	int TRANSIT_FLAG_KEYGUARD_LOCKED = 0x40;		int TRANSIT_FLAG_KEYGUARD_LOCKED = (1 << 6); // 0x40

	/**		/**
	* Transition flag: Indicates that this transition is for recents animation.		* Transition flag: Indicates that this transition is for recents animation.
	* TODO(b/188669821): Remove once special-case logic moves to shell.		* TODO(b/188669821): Remove once special-case logic moves to shell.
	* @hide		* @hide
	*/		*/
	int TRANSIT_FLAG_IS_RECENTS = 0x80;		int TRANSIT_FLAG_IS_RECENTS = (1 << 7); // 0x80

	/**		/**
	* Transition flag: Indicates that keyguard should go away with this transition.		* Transition flag: Indicates that keyguard should go away with this transition.
	* @hide		* @hide
	*/		*/
	int TRANSIT_FLAG_KEYGUARD_GOING_AWAY = 0x100;		int TRANSIT_FLAG_KEYGUARD_GOING_AWAY = (1 << 8); // 0x100

			/**
			* Transition flag: Keyguard is going away to the launcher, and it needs us to clear the task
			* snapshot of the launcher because it has changed something in the Launcher window.
			* @hide
			*/
			int TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_LAUNCHER_CLEAR_SNAPSHOT = (1 << 9); // 0x200

	/**		/**
	* @hide		* @hide
	@@ -562,12 +562,12 @@ public interface WindowManager extends ViewManager {
	TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION,		TRANSIT_FLAG_KEYGUARD_GOING_AWAY_NO_ANIMATION,
	TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER,		TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER,
	TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION,		TRANSIT_FLAG_KEYGUARD_GOING_AWAY_SUBTLE_ANIMATION,
	TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_LAUNCHER_CLEAR_SNAPSHOT,
	TRANSIT_FLAG_APP_CRASHED,		TRANSIT_FLAG_APP_CRASHED,
	TRANSIT_FLAG_OPEN_BEHIND,		TRANSIT_FLAG_OPEN_BEHIND,
	TRANSIT_FLAG_KEYGUARD_LOCKED,		TRANSIT_FLAG_KEYGUARD_LOCKED,
	TRANSIT_FLAG_IS_RECENTS,		TRANSIT_FLAG_IS_RECENTS,
	TRANSIT_FLAG_KEYGUARD_GOING_AWAY		TRANSIT_FLAG_KEYGUARD_GOING_AWAY,
			TRANSIT_FLAG_KEYGUARD_GOING_AWAY_TO_LAUNCHER_CLEAR_SNAPSHOT
	})		})
	@Retention(RetentionPolicy.SOURCE)		@Retention(RetentionPolicy.SOURCE)
	@interface TransitionFlags {}		@interface TransitionFlags {}