Merge "Transition bug fix"

This commit is contained in:
Gil Dobjanschi
2010-10-25 19:13:32 -07:00
committed by Android (Google) Code Review

View File

@@ -1155,12 +1155,14 @@ public class VideoEditorTestImpl implements VideoEditor {
private void removeAdjacentTransitions(MediaItem mediaItem) {
final Transition beginTransition = mediaItem.getBeginTransition();
if (beginTransition != null) {
beginTransition.getAfterMediaItem().setEndTransition(null);
beginTransition.invalidate();
mTransitions.remove(beginTransition);
}
final Transition endTransition = mediaItem.getEndTransition();
if (endTransition != null) {
endTransition.getBeforeMediaItem().setBeginTransition(null);
endTransition.invalidate();
mTransitions.remove(endTransition);
}