summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/android/camera/PhotoMenu.java11
-rw-r--r--src/com/android/camera/PhotoModule.java25
-rw-r--r--src/com/android/camera/ui/FaceView.java66
3 files changed, 86 insertions, 16 deletions
diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java
index e62285b56..d4d820949 100644
--- a/src/com/android/camera/PhotoMenu.java
+++ b/src/com/android/camera/PhotoMenu.java
@@ -394,6 +394,17 @@ public class PhotoMenu extends PieController
Toast.LENGTH_LONG).show();
}
mHdrOn = false;
+ } else if (notSame(pref,CameraSettings.KEY_AE_BRACKET_HDR,"Off")) {
+ Toast.makeText(mActivity,
+ R.string.flash_aebracket_message,Toast.LENGTH_SHORT).show();
+ setPreference(CameraSettings.KEY_FLASH_MODE,Parameters.FLASH_MODE_OFF);
+ } else if (notSame(pref,CameraSettings.KEY_FLASH_MODE,"Off")) {
+ ListPreference aePref =
+ mPreferenceGroup.findPreference(CameraSettings.KEY_AE_BRACKET_HDR);
+ if (notSame(aePref,CameraSettings.KEY_AE_BRACKET_HDR,"Off")) {
+ Toast.makeText(mActivity,
+ R.string.flash_aebracket_message,Toast.LENGTH_SHORT).show();
+ }
}
super.onSettingChanged(pref);
}
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index ccc47cd21..dea25ced6 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1463,6 +1463,14 @@ public class PhotoModule
null, null, null, colorEffect,
sceneMode, redeyeReduction, aeBracketing);
}
+ /* Disable focus if aebracket is ON */
+ String aeBracket = mParameters.get(CameraSettings.KEY_QC_AE_BRACKETING);
+ if (!aeBracket.equalsIgnoreCase("off")) {
+ String fMode = Parameters.FLASH_MODE_OFF;
+ mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, fMode);
+ mParameters.setFlashMode(fMode);
+ }
+
}
private void overrideCameraSettings(final String flashMode,
@@ -2344,6 +2352,16 @@ public class PhotoModule
String pictureFormat = mPreferences.getString(
CameraSettings.KEY_PICTURE_FORMAT,
mActivity.getString(R.string.pref_camera_picture_format_default));
+
+ //Change picture format to JPEG if camera is start from other APK by intent.
+ if (mIsImageCaptureIntent && !pictureFormat.equals(PIXEL_FORMAT_JPEG)) {
+ pictureFormat = PIXEL_FORMAT_JPEG;
+ Editor editor = mPreferences.edit();
+ editor.putString(CameraSettings.KEY_PICTURE_FORMAT,
+ mActivity.getString(R.string.pref_camera_picture_format_value_jpeg));
+ editor.apply();
+ }
+ Log.v(TAG, "Picture format value =" + pictureFormat);
mParameters.set(KEY_PICTURE_FORMAT, pictureFormat);
// Set JPEG quality.
@@ -2641,6 +2659,13 @@ public class PhotoModule
if(CameraUtil.isSupported(picture_flip, CameraSettings.getSupportedFlipMode(mParameters))){
mParameters.set(CameraSettings.KEY_QC_SNAPSHOT_PICTURE_FLIP, picture_flip);
}
+ /* Disable focus if aebracket is ON */
+ String aeBracket = mParameters.get(CameraSettings.KEY_QC_AE_BRACKETING);
+ if (!aeBracket.equalsIgnoreCase("off")) {
+ String fMode = Parameters.FLASH_MODE_OFF;
+ mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, fMode);
+ mParameters.setFlashMode(fMode);
+ }
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void setAutoExposureLockIfSupported() {
diff --git a/src/com/android/camera/ui/FaceView.java b/src/com/android/camera/ui/FaceView.java
index 7adabf2ad..1868e0a38 100644
--- a/src/com/android/camera/ui/FaceView.java
+++ b/src/com/android/camera/ui/FaceView.java
@@ -233,10 +233,19 @@ public class FaceView extends View
Log.e(TAG, "blink: (" + face.getLeftEyeBlinkDegree()+ ", " +
face.getRightEyeBlinkDegree() + ")");
if (face.leftEye != null) {
- point[0] = face.leftEye.x;
- point[1] = face.leftEye.y-delta_y/2;
- point[2] = face.leftEye.x;
- point[3] = face.leftEye.y+delta_y/2;
+ if ((mDisplayOrientation == 90) ||
+ (mDisplayOrientation == 270)) {
+ point[0] = face.leftEye.x;
+ point[1] = face.leftEye.y - delta_y / 2;
+ point[2] = face.leftEye.x;
+ point[3] = face.leftEye.y + delta_y / 2;
+ } else {
+ point[0] = face.leftEye.x - delta_x / 2;
+ point[1] = face.leftEye.y;
+ point[2] = face.leftEye.x + delta_x / 2;
+ point[3] = face.leftEye.y;
+
+ }
mMatrix.mapPoints (point);
if (face.getLeftEyeBlinkDegree() >= blink_threshold) {
canvas.drawLine(point[0]+ dx, point[1]+ dy,
@@ -244,10 +253,18 @@ public class FaceView extends View
}
}
if (face.rightEye != null) {
- point[0] = face.rightEye.x;
- point[1] = face.rightEye.y-delta_y/2;
- point[2] = face.rightEye.x;
- point[3] = face.rightEye.y+delta_y/2;
+ if ((mDisplayOrientation == 90) ||
+ (mDisplayOrientation == 270)) {
+ point[0] = face.rightEye.x;
+ point[1] = face.rightEye.y - delta_y / 2;
+ point[2] = face.rightEye.x;
+ point[3] = face.rightEye.y + delta_y / 2;
+ } else {
+ point[0] = face.rightEye.x - delta_x / 2;
+ point[1] = face.rightEye.y;
+ point[2] = face.rightEye.x + delta_x / 2;
+ point[3] = face.rightEye.y;
+ }
mMatrix.mapPoints (point);
if (face.getRightEyeBlinkDegree() >= blink_threshold) {
//Add offset to the points if the rect has an offset
@@ -286,20 +303,37 @@ public class FaceView extends View
(-length) + 0.5);
if (face.getLeftEyeBlinkDegree() < blink_threshold) {
- point[0] = face.leftEye.x;
- point[1] = face.leftEye.y;
- point[2] = face.leftEye.x + gazeRollX;
- point[3] = face.leftEye.y + gazeRollY;
+ if ((mDisplayOrientation == 90) ||
+ (mDisplayOrientation == 270)) {
+ point[0] = face.leftEye.x;
+ point[1] = face.leftEye.y;
+ point[2] = face.leftEye.x + gazeRollX;
+ point[3] = face.leftEye.y + gazeRollY;
+ } else {
+ point[0] = face.leftEye.x;
+ point[1] = face.leftEye.y;
+ point[2] = face.leftEye.x + gazeRollY;
+ point[3] = face.leftEye.y + gazeRollX;
+ }
mMatrix.mapPoints (point);
canvas.drawLine(point[0] +dx, point[1] + dy,
point[2] + dx, point[3] +dy, mPaint);
}
if (face.getRightEyeBlinkDegree() < blink_threshold) {
- point[0] = face.rightEye.x;
- point[1] = face.rightEye.y;
- point[2] = face.rightEye.x + gazeRollX;
- point[3] = face.rightEye.y + gazeRollY;
+ if ((mDisplayOrientation == 90) ||
+ (mDisplayOrientation == 270)) {
+ point[0] = face.rightEye.x;
+ point[1] = face.rightEye.y;
+ point[2] = face.rightEye.x + gazeRollX;
+ point[3] = face.rightEye.y + gazeRollY;
+ } else {
+ point[0] = face.rightEye.x;
+ point[1] = face.rightEye.y;
+ point[2] = face.rightEye.x + gazeRollY;
+ point[3] = face.rightEye.y + gazeRollX;
+
+ }
mMatrix.mapPoints (point);
canvas.drawLine(point[0] + dx, point[1] + dy,
point[2] + dx, point[3] + dy, mPaint);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 11:43:33 +0000