diff options
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 72 |
1 files changed, 44 insertions, 28 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index ade3b47cb..2062bceb3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1212,7 +1212,11 @@ public class PhotoModule if(mSnapshotMode == CameraInfo.CAMERA_SUPPORT_MODE_ZSL) { Log.v(TAG, "JpegPictureCallback : in zslmode"); mParameters = mCameraDevice.getParameters(); - mBurstSnapNum = mParameters.getInt("num-snaps-per-shutter"); + if (CameraUtil.isBurstSupported(mParameters)) { + mBurstSnapNum = mParameters.getInt("num-snaps-per-shutter"); + } else { + mBurstSnapNum = 1; + } } Log.v(TAG, "JpegPictureCallback: Received = " + mReceivedSnapNum + "Burst count = " + mBurstSnapNum); @@ -1576,7 +1580,11 @@ public class PhotoModule mParameters = mCameraDevice.getParameters(); } - mBurstSnapNum = mParameters.getInt("num-snaps-per-shutter"); + if (CameraUtil.isBurstSupported(mParameters)) { + mBurstSnapNum = mParameters.getInt("num-snaps-per-shutter"); + } else { + mBurstSnapNum = 1; + } mReceivedSnapNum = 0; mPreviewRestartSupport = SystemProperties.getBoolean( PERSIST_PREVIEW_RESTART, false); @@ -2510,6 +2518,9 @@ public class PhotoModule } return true; case KeyEvent.KEYCODE_DPAD_LEFT: + if (!CameraUtil.isSupported(mParameters, "luma-adaptation")) { + break; + } if ( (mCameraState != PREVIEW_STOPPED) && (mFocusManager != null) && (mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING) && (mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING_SNAP_ON_FINISH) ) { @@ -2531,6 +2542,9 @@ public class PhotoModule } break; case KeyEvent.KEYCODE_DPAD_RIGHT: + if (!CameraUtil.isSupported(mParameters, "luma-adaptation")) { + break; + } if ( (mCameraState != PREVIEW_STOPPED) && (mFocusManager != null) && (mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING) && (mFocusManager.getCurrentFocusState() != mFocusManager.STATE_FOCUSING_SNAP_ON_FINISH) ) { @@ -2911,32 +2925,38 @@ public class PhotoModule mParameters.setColorEffect(colorEffect); } //Set Saturation - String saturationStr = mPreferences.getString( - CameraSettings.KEY_SATURATION, - mActivity.getString(R.string.pref_camera_saturation_default)); - int saturation = Integer.parseInt(saturationStr); - Log.v(TAG, "Saturation value =" + saturation); - if((0 <= saturation) && (saturation <= mParameters.getMaxSaturation())){ - mParameters.setSaturation(saturation); + if (CameraUtil.isSupported(mParameters, "saturation")) { + String saturationStr = mPreferences.getString( + CameraSettings.KEY_SATURATION, + mActivity.getString(R.string.pref_camera_saturation_default)); + int saturation = Integer.parseInt(saturationStr); + Log.v(TAG, "Saturation value =" + saturation); + if((0 <= saturation) && (saturation <= mParameters.getMaxSaturation())){ + mParameters.setSaturation(saturation); + } } // Set contrast parameter. - String contrastStr = mPreferences.getString( - CameraSettings.KEY_CONTRAST, - mActivity.getString(R.string.pref_camera_contrast_default)); - int contrast = Integer.parseInt(contrastStr); - Log.v(TAG, "Contrast value =" +contrast); - if((0 <= contrast) && (contrast <= mParameters.getMaxContrast())){ - mParameters.setContrast(contrast); + if (CameraUtil.isSupported(mParameters, "contrast")) { + String contrastStr = mPreferences.getString( + CameraSettings.KEY_CONTRAST, + mActivity.getString(R.string.pref_camera_contrast_default)); + int contrast = Integer.parseInt(contrastStr); + Log.v(TAG, "Contrast value =" + contrast); + if ((0 <= contrast) && (contrast <= mParameters.getMaxContrast())) { + mParameters.setContrast(contrast); + } } // Set sharpness parameter - String sharpnessStr = mPreferences.getString( - CameraSettings.KEY_SHARPNESS, - mActivity.getString(R.string.pref_camera_sharpness_default)); - int sharpness = Integer.parseInt(sharpnessStr) * - (mParameters.getMaxSharpness()/MAX_SHARPNESS_LEVEL); - Log.v(TAG, "Sharpness value =" + sharpness); - if((0 <= sharpness) && (sharpness <= mParameters.getMaxSharpness())){ - mParameters.setSharpness(sharpness); + if (CameraUtil.isSupported(mParameters, "sharpness")) { + String sharpnessStr = mPreferences.getString( + CameraSettings.KEY_SHARPNESS, + mActivity.getString(R.string.pref_camera_sharpness_default)); + int sharpness = Integer.parseInt(sharpnessStr) * + (mParameters.getMaxSharpness() / MAX_SHARPNESS_LEVEL); + Log.v(TAG, "Sharpness value =" + sharpness); + if ((0 <= sharpness) && (sharpness <= mParameters.getMaxSharpness())) { + mParameters.setSharpness(sharpness); + } } // Set Face Recognition String faceRC = mPreferences.getString( @@ -4542,8 +4562,6 @@ class GraphView extends View { private CameraManager.CameraProxy mGraphCameraDevice; private float scaled; private static final int STATS_SIZE = 256; - private static final String TAG = "GraphView"; - public GraphView(Context context, AttributeSet attrs) { super(context,attrs); @@ -4562,9 +4580,7 @@ class GraphView extends View { } @Override protected void onDraw(Canvas canvas) { - Log.v(TAG, "in Camera.java ondraw"); if(mPhotoModule == null || !mPhotoModule.mHiston ) { - Log.e(TAG, "returning as histogram is off "); return; } |