Removed the start and end transition types. (fa3d2631) · Commits · e / os / android_frameworks_base

media/java/android/media/videoeditor/TransitionEndCurtainClosing.java

deleted100644 → 0

+0 −54

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media.videoeditor;

		/**
		* This transition fades to black frame using curtain closing: A black image is
		* moved from top to bottom to cover the video. This transition is always
		* applied at the end of the movie. {@hide}
		*/
		public class TransitionEndCurtainClosing extends Transition {
		/**
		* An object of this type cannot be instantiated by using the default
		* constructor
		*/
		@SuppressWarnings("unused")
		private TransitionEndCurtainClosing() {
		this(null, null, 0, BEHAVIOR_LINEAR);
		}

		/**
		* Constructor.
		*
		* @param transitionId The transition id
		* @param afterMediaItem The transition is applied to the end of this
		* media item
		* @param durationMs duration of the transition in milliseconds
		* @param behavior The transition behavior
		*/
		public TransitionEndCurtainClosing(String transitionId, MediaItem afterMediaItem,
		long duration, int behavior) {
		super(transitionId, afterMediaItem, null, duration, behavior);
		}

		/*
		* {@inheritDoc}
		*/
		@Override
		void generate() {
		}
		}

media/java/android/media/videoeditor/TransitionEndFadeToBlack.java

deleted100755 → 0

+0 −54

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media.videoeditor;

		/**
		* This transition fades to black frame using fade out in a certain provided
		* duration. This transition is always applied at the end of the movie. {@hide
		* }
		*/
		public class TransitionEndFadeToBlack extends Transition {
		/**
		* An object of this type cannot be instantiated by using the default
		* constructor
		*/
		@SuppressWarnings("unused")
		private TransitionEndFadeToBlack() {
		this(null, null, 0, BEHAVIOR_LINEAR);
		}

		/**
		* Constructor.
		*
		* @param transitionId The transition id
		* @param afterMediaItem The transition is applied to the end of this
		* media item
		* @param durationMs duration of the transition in milliseconds
		* @param behavior The transition behavior
		*/
		public TransitionEndFadeToBlack(String transitionId, MediaItem afterMediaItem, long duration,
		int behavior) {
		super(transitionId, afterMediaItem, null, duration, behavior);
		}

		/*
		* {@inheritDoc}
		*/
		@Override
		void generate() {
		}
		}

media/java/android/media/videoeditor/TransitionFadeToBlack.java→media/java/android/media/videoeditor/TransitionFadeBlack.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -18,16 +18,17 @@ package android.media.videoeditor;


		/**
		* This class is used to render a fade to black transition between two videos.
		* This class is used to render a fade to black and fade from black transition
		* between two media items.
		* {@hide}
		*/
		public class TransitionFadeToBlack extends Transition {
		public class TransitionFadeBlack extends Transition {
		/**
		* An object of this type cannot be instantiated by using the default
		* constructor
		*/
		@SuppressWarnings("unused")
		private TransitionFadeToBlack() {
		private TransitionFadeBlack() {
		this(null, null, null, 0, 0);
		}

		@@ -45,7 +46,7 @@ public class TransitionFadeToBlack extends Transition {
		*
		* @throws IllegalArgumentException if behavior is not supported.
		*/
		public TransitionFadeToBlack(String transitionId, MediaItem afterMediaItem,
		public TransitionFadeBlack(String transitionId, MediaItem afterMediaItem,
		MediaItem beforeMediaItem, long durationMs, int behavior) {
		super(transitionId, afterMediaItem, beforeMediaItem, durationMs, behavior);
		}

media/java/android/media/videoeditor/TransitionStartCurtainOpening.java

deleted100755 → 0

+0 −56

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media.videoeditor;


		/**
		* This transition fades from black frame using curtain opening. A black
		* image is displayed and moves from bottom to top making the video visible.
		* This transition is always applied at the beginning of the movie.
		* {@hide}
		*/
		public class TransitionStartCurtainOpening extends Transition {
		/**
		* An object of this type cannot be instantiated by using the default
		* constructor
		*/
		@SuppressWarnings("unused")
		private TransitionStartCurtainOpening() {
		this(null, null, 0, Transition.BEHAVIOR_LINEAR);
		}

		/**
		* Constructor
		*
		* @param transitionId The transition id
		* @param beforeMediaItem The transition is applied to the beginning of
		* this media item
		* @param durationMs The duration of the transition in milliseconds
		* @param behavior The transition behavior
		*/
		public TransitionStartCurtainOpening(String transitionId, MediaItem beforeMediaItem,
		long durationMs, int behavior) {
		super(transitionId, null, beforeMediaItem, durationMs, behavior);
		}

		/*
		* {@inheritDoc}
		*/
		@Override
		public void generate() {
		}
		}

media/java/android/media/videoeditor/TransitionStartFadeFromBlack.java

deleted100644 → 0

+0 −54

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media.videoeditor;

		/**
		* This transition fades from black using fade-in in a certain provided
		* duration. This transition is always applied at the beginning of the movie.
		* {@hide}
		*/
		public class TransitionStartFadeFromBlack extends Transition {
		/**
		* An object of this type cannot be instantiated by using the default
		* constructor
		*/
		@SuppressWarnings("unused")
		private TransitionStartFadeFromBlack() {
		this(null, null, 0, Transition.BEHAVIOR_LINEAR);
		}

		/**
		* Constructor
		*
		* @param transitionId The transition id
		* @param beforeMediaItem The transition is applied to the beginning of
		* this media item
		* @param durationMs The duration of the transition in milliseconds
		* @param behavior The transition behavior
		*/
		public TransitionStartFadeFromBlack(String transitionId, MediaItem beforeMediaItem,
		long durationMs, int behavior) {
		super(transitionId, null, beforeMediaItem, durationMs, behavior);
		}

		/*
		* {@inheritDoc}
		*/
		@Override
		public void generate() {
		}
		}