Merge "Disallow makeSceneTransitionAnimation without FEATURE_CONTENT_TRANSITIONS" (e8f5a255) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityOptions.java

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -365,11 +365,15 @@ public class ActivityOptions {
	* @param listener The listener to use to monitor activity transition events.		* @param listener The listener to use to monitor activity transition events.
	* @return Returns a new ActivityOptions object that you can use to		* @return Returns a new ActivityOptions object that you can use to
	* supply these options as the options Bundle when starting an activity.		* supply these options as the options Bundle when starting an activity.
			* Returns null if the Window does not have {@link Window#FEATURE_CONTENT_TRANSITIONS}.
	* @see android.transition.Transition#setEpicenterCallback(		* @see android.transition.Transition#setEpicenterCallback(
	* android.transition.Transition.EpicenterCallback)		* android.transition.Transition.EpicenterCallback)
	*/		*/
	public static ActivityOptions makeSceneTransitionAnimation(Window window,		public static ActivityOptions makeSceneTransitionAnimation(Window window,
	ActivityTransitionListener listener) {		ActivityTransitionListener listener) {
			if (!window.hasFeature(Window.FEATURE_CONTENT_TRANSITIONS)) {
			return null;
			}
	ActivityOptions opts = new ActivityOptions();		ActivityOptions opts = new ActivityOptions();
	opts.mAnimationType = ANIM_SCENE_TRANSITION;		opts.mAnimationType = ANIM_SCENE_TRANSITION;
	ExitTransitionCoordinator exit = new ExitTransitionCoordinator(window, listener);		ExitTransitionCoordinator exit = new ExitTransitionCoordinator(window, listener);