diff options
| author | Chih-yu Huang <akahuang@google.com> | 2011-10-21 11:50:02 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2011-10-21 19:47:21 +0800 |
| commit | 048edf2ef22607b85bc4b062e2af71804f5b3530 (patch) | |
| tree | c6fd30acd6a03b034296667f666f197c1d0bccb7 /src/com/android/camera/Camera.java | |
| parent | 7d9eadd0c6c38b3761b7e8d3fa3658d194810d60 (diff) | |
| download | LegacyCamera-048edf2ef22607b85bc4b062e2af71804f5b3530.zip LegacyCamera-048edf2ef22607b85bc4b062e2af71804f5b3530.tar.gz LegacyCamera-048edf2ef22607b85bc4b062e2af71804f5b3530.tar.bz2 | |
Fix focus area in front camera.
Front camera preview is mirrored. Change to use matrix to
calculate the focus area. So the focus area will be
correct in all orientations in front or back camera.
bug:5446617
bug:5461028
Change-Id: I2d39a22cd9f034c5028843ca3d4abe0f9962f18a
Diffstat (limited to 'src/com/android/camera/Camera.java')
| -rw-r--r-- | src/com/android/camera/Camera.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java index ecff831..931095e 100644 --- a/src/com/android/camera/Camera.java +++ b/src/com/android/camera/Camera.java @@ -377,7 +377,10 @@ public class Camera extends ActivityBase implements FocusManager.Listener, mPreviewFrame = findViewById(R.id.camera_preview); mPreviewFrame.setOnTouchListener(this); mFocusIndicator = (RotateLayout) findViewById(R.id.focus_indicator_rotate_layout); - mFocusManager.initialize(mFocusIndicator, mPreviewFrame, mFaceView, this); + CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId]; + boolean mirror = (info.facing == CameraInfo.CAMERA_FACING_FRONT); + mFocusManager.initialize(mFocusIndicator, mPreviewFrame, mFaceView, this, + mirror, mDisplayOrientation); mFocusManager.initializeSoundPlayer(getResources().openRawResourceFd(R.raw.camera_focus)); mImageSaver = new ImageSaver(); Util.initializeScreenBrightness(getWindow(), getContentResolver()); |