From 74976b1397fe34b212741bd92e30fa25aaec7ad8 Mon Sep 17 00:00:00 2001
From: Wu-cheng Li <wuchengli@google.com>
Date: Thu, 26 Apr 2012 18:36:54 +0800
Subject: [PATCH] Do not use card effect for camera screen nail.

bug:6402571
Change-Id: I362e675ea4160b7b940e0da4bd018e0e8c7add57
---
 src/com/android/gallery3d/ui/PhotoView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 3de383b07..c76996189 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -421,7 +421,7 @@ public class PhotoView extends GLView {
                     (viewH / 2f - r.exactCenterY()) / scale + 0.5f);
 
             boolean wantsCardEffect = CARD_EFFECT && !mFilmMode
-                && !mPictures.get(-1).isCamera();
+                && !mPictures.get(-1).isCamera() && !mIsCamera;
             if (wantsCardEffect) {
                 // Calculate the move-out progress value.
                 int left = r.left;
-- 
2.11.0