summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rwxr-xr-xsrc/com/android/camera/PhotoModule.java30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 97b57c27e..6040a0e22 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -787,8 +787,8 @@ public class PhotoModule
mParameters = mCameraDevice.getParameters();
mInitialParams = mCameraDevice.getParameters();
initializeCapabilities();
- CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
- mMirror = (info.facing == CameraInfo.CAMERA_FACING_FRONT);
+ CameraHolder.CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
+ mMirror = (info.facing == CameraHolder.CameraInfo.CAMERA_FACING_FRONT);
mFocusManager.setMirror(mMirror);
mFocusManager.setParameters(mInitialParams);
setupPreview();
@@ -893,7 +893,7 @@ public class PhotoModule
}
void setPreviewFrameLayoutCameraOrientation(){
- CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
+ CameraHolder.CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
//if camera mount angle is 0 or 180, we want to resize preview
if (info.orientation % 180 == 0){
mUI.cameraOrientationPreviewResize(true);
@@ -1022,9 +1022,9 @@ public class PhotoModule
|| mFaceDetectionStarted || mCameraState != IDLE) return;
if (mParameters.getMaxNumDetectedFaces() > 0) {
mFaceDetectionStarted = true;
- CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
+ CameraHolder.CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
mUI.onStartFaceDetection(mDisplayOrientation,
- (info.facing == CameraInfo.CAMERA_FACING_FRONT));
+ (info.facing == CameraHolder.CameraInfo.CAMERA_FACING_FRONT));
mCameraDevice.setFaceDetectionCallback(mHandler, mUI);
mCameraDevice.startFaceDetection();
}
@@ -1443,11 +1443,13 @@ public class PhotoModule
needRestartPreview |= (isLongshotDone() && !mFocusManager.isZslEnabled());
needRestartPreview |= mLgeHdrMode && (mCameraState != LONGSHOT);
- CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
+ CameraHolder.CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
- final boolean isAuxCamera = info.facing > CameraInfo.CAMERA_FACING_FRONT;
- final boolean isBackCamera = info.facing == CameraInfo.CAMERA_FACING_BACK;
- final boolean isFrontCamera = info.facing == CameraInfo.CAMERA_FACING_FRONT;
+ final boolean isAuxCamera = info.facing > CameraHolder.CameraInfo.CAMERA_FACING_FRONT;
+ final boolean isBackCamera =
+ info.facing == CameraHolder.CameraInfo.CAMERA_FACING_BACK;
+ final boolean isFrontCamera =
+ info.facing == CameraHolder.CameraInfo.CAMERA_FACING_FRONT;
boolean auxCameraRestartPreviewOnPictureTaken = false;
boolean backCameraRestartPreviewOnPictureTaken = false;
boolean frontCameraRestartPreviewOnPictureTaken = false;
@@ -2238,7 +2240,7 @@ public class PhotoModule
mCameraId, CameraHolder.instance().getCameraInfo());
mPreferenceGroup = settings.getPreferenceGroup(R.xml.camera_preferences);
- int numOfCams = Camera.getNumberOfCameras();
+ int numOfCams = CameraHolder.instance().getNumberOfCameras();
Log.e(TAG,"loadCameraPreferences() updating camera_id pref");
@@ -2256,8 +2258,8 @@ public class PhotoModule
int[] largeIconIds = new int[numOfCams];
for(int i=0;i<numOfCams;i++) {
- CameraInfo info = CameraHolder.instance().getCameraInfo()[i];
- if(info.facing == CameraInfo.CAMERA_FACING_BACK) {
+ CameraHolder.CameraInfo info = CameraHolder.instance().getCameraInfo()[i];
+ if(info.facing == CameraHolder.CameraInfo.CAMERA_FACING_BACK) {
iconIds[i] = R.drawable.ic_switch_back;
entries[i] = mActivity.getResources().getString(R.string.pref_camera_id_entry_back);
labels[i] = mActivity.getResources().getString(R.string.pref_camera_id_label_back);
@@ -2820,8 +2822,8 @@ public class PhotoModule
if (mFocusManager != null) {
mFocusManager.removeMessages();
} else {
- CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
- mMirror = (info.facing == CameraInfo.CAMERA_FACING_FRONT);
+ CameraHolder.CameraInfo info = CameraHolder.instance().getCameraInfo()[mCameraId];
+ mMirror = (info.facing == CameraHolder.CameraInfo.CAMERA_FACING_FRONT);
String[] defaultFocusModes = mActivity.getResources().getStringArray(
R.array.pref_camera_focusmode_default_array);
synchronized (this) {