summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/VideoUI.java
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2013-08-21 13:42:22 -0700
committerDoris Liu <tianliu@google.com>2013-08-21 17:59:58 -0700
commit3973deba115d398a25f0b74c2aea2ff4079355a5 (patch)
tree53b9f1cd07317d51ddd9e081298d408f01708106 /src/com/android/camera/VideoUI.java
parent304a6360c3b710a4a5781788b887ca479646c86f (diff)
downloadandroid_packages_apps_Snap-3973deba115d398a25f0b74c2aea2ff4079355a5.tar.gz
android_packages_apps_Snap-3973deba115d398a25f0b74c2aea2ff4079355a5.tar.bz2
android_packages_apps_Snap-3973deba115d398a25f0b74c2aea2ff4079355a5.zip
Fix video capture animation and video snapshot animation
Also removed unused effects recording code Bug: 10326106 Bug: 10414112 Change-Id: I904a26a0b10c75fcce650dc0ec63d7c11746dc2e
Diffstat (limited to 'src/com/android/camera/VideoUI.java')
-rw-r--r--src/com/android/camera/VideoUI.java16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoUI.java b/src/com/android/camera/VideoUI.java
index 684179698..622ffa3d3 100644
--- a/src/com/android/camera/VideoUI.java
+++ b/src/com/android/camera/VideoUI.java
@@ -305,9 +305,25 @@ public class VideoUI implements PieRenderer.PieListener,
/**
* Starts a capture animation
+ */
+ public void animateCapture() {
+ Bitmap bitmap = null;
+ if (mTextureView != null) {
+ bitmap = mTextureView.getBitmap((int) mSurfaceTextureUncroppedWidth / 2,
+ (int) mSurfaceTextureUncroppedHeight / 2);
+ }
+ animateCapture(bitmap);
+ }
+
+ /**
+ * Starts a capture animation
* @param bitmap the captured image that we shrink and slide in the animation
*/
public void animateCapture(Bitmap bitmap) {
+ if (bitmap == null) {
+ Log.e(TAG, "No valid bitmap for capture animation.");
+ return;
+ }
((ImageView) mPreviewThumb).setImageBitmap(bitmap);
mAnimationManager.startCaptureAnimation(mPreviewThumb);
}