commit 21420d6d847e111c425233821eddb918cc50a456
author John Wang <johnwang@google.com> Fri Oct 15 14:26:51 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 15 14:26:51 2010 -0700
tree c13e0ce999a037ae1c3d394b1c7b22ad90233cda
parent a617fdc65be94d0ff875090d45168eec354c919e
parent b9e9f6f7e925a681fb84f21f6b2b05d338bcb747

Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

media/java/android/media/videoeditor/VideoEditorTestImpl.java

diff --git a/media/java/android/media/videoeditor/VideoEditorTestImpl.java b/media/java/android/media/videoeditor/VideoEditorTestImpl.java
index 753fe06..a4dabff 100644
--- a/media/java/android/media/videoeditor/VideoEditorTestImpl.java
+++ b/media/java/android/media/videoeditor/VideoEditorTestImpl.java
@@ -641,7 +641,8 @@
                         final EffectColor colorEffect = (EffectColor)effect;
                         serializer.attribute("", ATTR_COLOR_EFFECT_TYPE,
                                 Integer.toString(colorEffect.getType()));
-                        if (colorEffect.getType() == EffectColor.TYPE_COLOR) {
+                        if (colorEffect.getType() == EffectColor.TYPE_COLOR ||
+                                colorEffect.getType() == EffectColor.TYPE_GRADIENT) {
                             serializer.attribute("", ATTR_COLOR_EFFECT_VALUE,
                                     Integer.toString(colorEffect.getColor()));
                         }