Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 590f87fe authored by Gil Dobjanschi's avatar Gil Dobjanschi
Browse files

Added the behavior paramter to transition constructors 

Change-Id: Ic8758fb81e9b9c30982f3ced2d9fffc3439b7c7e
parent 11dd3254

media/java/android/media/videoeditor/Transition.java

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import java.io.File; 
 */

public abstract class Transition {

    // The transition behavior

    private static final int BEHAVIOR_MIN_VALUE = 0;

    /** The transition starts slowly and speed up */

    public static final int BEHAVIOR_SPEED_UP = 0;

    /** The transition start fast and speed down */
@@ -45,6 +46,8 @@ public abstract class Transition { 
    /** The transition starts slowly and ends slowly with a fast middle */

    public static final int BEHAVIOR_MIDDLE_FAST = 4;



    private static final int BEHAVIOR_MAX_VALUE = 4;



    // The unique id of the transition

    private final String mUniqueId;
@@ -84,6 +87,9 @@ public abstract class Transition { 
     */

    protected Transition(String transitionId, MediaItem afterMediaItem, MediaItem beforeMediaItem,

            long durationMs, int behavior) {

        if (behavior < BEHAVIOR_MIN_VALUE || behavior > BEHAVIOR_MAX_VALUE) {

            throw new IllegalArgumentException("Invalid behavior: " + behavior);

        }

        mUniqueId = transitionId;

        mAfterMediaItem = afterMediaItem;

        mBeforeMediaItem = beforeMediaItem;

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

+4 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class TransitionEndCurtainClosing extends Transition { 
     */

    @SuppressWarnings("unused")

    private TransitionEndCurtainClosing() {

        this(null, null, 0);

        this(null, null, 0, BEHAVIOR_LINEAR);

    }



    /**
@@ -38,10 +38,11 @@ public class TransitionEndCurtainClosing extends Transition { 
     * @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) {

        super(transitionId, afterMediaItem, null, duration, Transition.BEHAVIOR_LINEAR);

            long duration, int behavior) {

        super(transitionId, afterMediaItem, null, duration, behavior);

    }



    /*

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

+5 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class TransitionEndFadeToBlack extends Transition { 
     */

    @SuppressWarnings("unused")

    private TransitionEndFadeToBlack() {

        this(null, null, 0);

        this(null, null, 0, BEHAVIOR_LINEAR);

    }



    /**
@@ -38,9 +38,11 @@ public class TransitionEndFadeToBlack extends Transition { 
     * @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) {

        super(transitionId, afterMediaItem, null, duration, Transition.BEHAVIOR_LINEAR);

    public TransitionEndFadeToBlack(String transitionId, MediaItem afterMediaItem, long duration,

            int behavior) {

        super(transitionId, afterMediaItem, null, duration, behavior);

    }



    /*

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

+4 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public class TransitionStartCurtainOpening extends Transition { 
     */

    @SuppressWarnings("unused")

    private TransitionStartCurtainOpening() {

        this(null, null, 0);

        this(null, null, 0, Transition.BEHAVIOR_LINEAR);

    }



    /**
@@ -40,11 +40,11 @@ public class TransitionStartCurtainOpening extends Transition { 
     * @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) {

        super(transitionId, null, beforeMediaItem, durationMs,

                Transition.BEHAVIOR_LINEAR);

            long durationMs, int behavior) {

        super(transitionId, null, beforeMediaItem, durationMs, behavior);

    }



    /*

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

+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class TransitionStartFadeFromBlack extends Transition { 
     */

    @SuppressWarnings("unused")

    private TransitionStartFadeFromBlack() {

        this(null, null, 0);

        this(null, null, 0, Transition.BEHAVIOR_LINEAR);

    }



    /**
@@ -38,11 +38,11 @@ public class TransitionStartFadeFromBlack extends Transition { 
     * @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) {

        super(transitionId, null, beforeMediaItem, durationMs,

                Transition.BEHAVIOR_LINEAR);

            long durationMs, int behavior) {

        super(transitionId, null, beforeMediaItem, durationMs, behavior);

    }



    /*