SDcamera:Fix AE mode is changed after Snapshot

when in dev option, apply common settings after snapshot

Change-Id: I96a25267ea43167137cc19fb82f4a23431b3199e

1 files changed, 2 insertions, 12 deletions

diff --git a/src/com/android/camera/ui/Camera2FaceView.java b/src/com/android/camera/ui/Camera2FaceView.java
index d08a4a722..81be61f81 100644
--- a/src/com/android/camera/ui/Camera2FaceView.java
+++ b/src/com/android/camera/ui/Camera2FaceView.java
@@ -117,14 +117,6 @@ public class Camera2FaceView extends FaceView {
                 rw = rh;
                 rh = temp;
             }
-            if (rw * mCameraBound.width() != mCameraBound.height() * rh) {
-                if (rw >= getWidth()) {
-                    rh = getWidth() * mCameraBound.width() / mCameraBound.height();
-                }
-                if (rh >= getHeight()) {
-                    rw = getHeight() * mCameraBound.height() / mCameraBound.width();
-                }
-            }
             CameraUtil.prepareMatrix(mMatrix, mMirror, mDisplayOrientation, rw, rh);
 
             // mMatrix assumes that the face coordinates are from -1000 to 1000.
@@ -139,10 +131,8 @@ public class Camera2FaceView extends FaceView {
             bsgcTranslateMatrix.postScale(2000f / mCameraBound.width(),
                     2000f / mCameraBound.height());
 
-            int dx = (getWidth() - mUncroppedWidth) / 2;
-            dx -= (rw - mUncroppedWidth) / 2;
-            int dy = (getHeight() - mUncroppedHeight) / 2;
-            dy -= (rh - mUncroppedHeight) / 2;
+            int dx = (getWidth() - rw) / 2;
+            int dy = (getHeight() - rh) / 2;
 
             // Focus indicator is directional. Rotate the matrix and the canvas
             // so it looks correctly in all orientations.