Add flash animation to photo module

Change-Id: I9faa46e71e27064c4fbcb629c5c31cc4d7b22652

1 files changed, 7 insertions, 11 deletions

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 49b209d34..7c4487b90 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -49,7 +49,6 @@ import android.os.SystemClock;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.OrientationEventListener;
 import android.view.SurfaceHolder;
 import android.view.View;
@@ -74,7 +73,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Formatter;
 import java.util.List;
 
@@ -940,18 +938,16 @@ public class PhotoModule
     }
 
     private void animateFlash() {
-        /* //TODO:
         // Only animate when in full screen capture mode
         // i.e. If monkey/a user swipes to the gallery during picture taking,
         // don't show animation
-        if (ApiHelper.HAS_SURFACE_TEXTURE && !mIsImageCaptureIntent
-                && mActivity.mShowCameraAppView) {
-            // Start capture animation.
-            ((CameraScreenNail) mActivity.mCameraScreenNail).animateFlash(mDisplayRotation);
-            mUI.enablePreviewThumb(true);
-            mHandler.sendEmptyMessageDelayed(CAPTURE_ANIMATION_DONE,
-                    CaptureAnimManager.getAnimationDuration());
-        } */
+        if (!mIsImageCaptureIntent) {
+            mUI.animateFlash();
+
+            // TODO: mUI.enablePreviewThumb(true);
+            // mHandler.sendEmptyMessageDelayed(CAPTURE_ANIMATION_DONE,
+            //        CaptureAnimManager.getAnimationDuration());
+        }
     }
 
     @Override