summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
diff options
context:
space:
mode:
authorChih-yu Huang <akahuang@google.com>2011-10-21 12:01:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-21 12:01:01 -0700
commit83abe885d9809c1404a1f7e17537ee9a9c61fb57 (patch)
tree17c1cd5cb1f7c82ea4ab7b8bfaed9718d92ca9b9 /src/com/android/camera/Camera.java
parentf5ba96adb5d72f9cac77ff21614f54e0d2bbb795 (diff)
parent048edf2ef22607b85bc4b062e2af71804f5b3530 (diff)
downloadLegacyCamera-83abe885d9809c1404a1f7e17537ee9a9c61fb57.zip
LegacyCamera-83abe885d9809c1404a1f7e17537ee9a9c61fb57.tar.gz
LegacyCamera-83abe885d9809c1404a1f7e17537ee9a9c61fb57.tar.bz2
am 048edf2e: Fix focus area in front camera.
* commit '048edf2ef22607b85bc4b062e2af71804f5b3530': Fix focus area in front camera.
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r--src/com/android/camera/Camera.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 1af1d8d..252dff7 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());