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.java68
1 files changed, 31 insertions, 37 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 5e954bbaf..a0cfc2662 100755
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -2028,8 +2028,10 @@ public class PhotoModule
(fssr != null && fssr.equals(fssrOn)) ||
(truePortrait != null && truePortrait.equals(truPortraitOn)) ||
(stillMore != null && stillMore.equals(stillMoreOn))) {
- if ( (optiZoom != null && optiZoom.equals(optiZoomOn)) ||
- (reFocus != null && reFocus.equals(reFocusOn)) ) {
+ if ((optiZoom != null && optiZoom.equals(optiZoomOn)) ||
+ (reFocus != null && reFocus.equals(reFocusOn)) ||
+ (CameraSettings.hasChromaFlashScene(mActivity) &&
+ chromaFlash != null && chromaFlash.equals(chromaFlashOn))) {
sceneMode = null;
} else {
mSceneMode = sceneMode = Parameters.SCENE_MODE_AUTO;
@@ -2053,7 +2055,8 @@ public class PhotoModule
// If scene mode is set, for white balance and focus mode
// read settings from preferences so we retain user preferences.
- if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
+ if (!Parameters.SCENE_MODE_AUTO.equals(mSceneMode) &&
+ !"asd".equals(mSceneMode) && !"sports".equals(mSceneMode)) {
flashMode = Parameters.FLASH_MODE_OFF;
String whiteBalance = Parameters.WHITE_BALANCE_AUTO;
focusMode = mFocusManager.getFocusMode(false);
@@ -2105,6 +2108,12 @@ public class PhotoModule
flashMode = Parameters.FLASH_MODE_OFF;
mParameters.setFlashMode(flashMode);
}
+
+ if (chromaFlash != null && chromaFlash.equals(chromaFlashOn)) {
+ flashMode = Parameters.FLASH_MODE_ON;
+ mParameters.setFlashMode(flashMode);
+ }
+
if (disableLongShot) {
mUI.overrideSettings(CameraSettings.KEY_LONGSHOT,
mActivity.getString(R.string.setting_off_value));
@@ -3242,6 +3251,8 @@ public class PhotoModule
mParameters.set("long-shot", longshot_enable);
String optizoomOn = mActivity.getString(R.string
.pref_camera_advanced_feature_value_optizoom_on);
+ String chromaFlashOn = mActivity.getString(R.string
+ .pref_camera_advanced_feature_value_chromaflash_on);
// Set Touch AF/AEC parameter.
if (CameraUtil.isSupported(mParameters.TOUCH_AF_AEC_ON,
@@ -4180,7 +4191,10 @@ public class PhotoModule
.pref_camera_advanced_feature_value_refocus_on);
String optizoomOn = mActivity.getString(R.string
.pref_camera_advanced_feature_value_optizoom_on);
+ String chromaFlashOn = mActivity.getString(R.string
+ .pref_camera_advanced_feature_value_chromaflash_on);
String scenModeStr = mSceneMode;
+
if (refocusOn.equals(mSceneMode)) {
try {
mSceneMode = Parameters.SCENE_MODE_AUTO;
@@ -4198,6 +4212,12 @@ public class PhotoModule
}
} catch (NullPointerException e) {
}
+ } else if (chromaFlashOn.equals(mSceneMode)) {
+ try {
+ mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, chromaFlashOn);
+ mParameters.setSceneMode(Parameters.SCENE_MODE_AUTO);
+ } catch (NullPointerException e) {
+ }
} else if (mSceneMode == null) {
mSceneMode = Parameters.SCENE_MODE_AUTO;
}
@@ -4254,7 +4274,8 @@ public class PhotoModule
Log.w(TAG, "invalid exposure range: " + value);
}
- if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
+ if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode) ||
+ "asd".equals(mSceneMode) || "sports".equals(mSceneMode)) {
// Set flash mode.
String flashMode;
if (mSavedFlashMode == null) {
@@ -4308,9 +4329,10 @@ public class PhotoModule
mActivity.getString(R.string.pref_camera_focustime_default))));
} else {
mFocusManager.overrideFocusMode(mParameters.getFocusMode());
- if (CameraUtil.isSupported(Parameters.FLASH_MODE_OFF,
- mParameters.getSupportedFlashModes())) {
- mParameters.setFlashMode(Parameters.FLASH_MODE_OFF);
+ String flashMode = chromaFlashOn.equals(mSceneMode) ?
+ Parameters.FLASH_MODE_ON : Parameters.FLASH_MODE_OFF;
+ if (CameraUtil.isSupported(flashMode, mParameters.getSupportedFlashModes())) {
+ mParameters.setFlashMode(flashMode);
}
if (CameraUtil.isSupported(Parameters.WHITE_BALANCE_AUTO,
mParameters.getSupportedWhiteBalance())) {
@@ -4956,7 +4978,8 @@ public class PhotoModule
updateRemainingPhotos();
}
- if (CameraSettings.KEY_QC_CHROMA_FLASH.equals(pref.getKey())) {
+ if (!CameraSettings.hasChromaFlashScene(mActivity) &&
+ CameraSettings.KEY_QC_CHROMA_FLASH.equals(pref.getKey())) {
mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, pref.getValue());
}
@@ -4969,35 +4992,6 @@ public class PhotoModule
mUI.setPreference(CameraSettings.KEY_ADVANCED_FEATURES, pref.getValue());
}
- String ubiFocusOff = mActivity.getString(R.string.
- pref_camera_advanced_feature_value_ubifocus_off);
- String chromaFlashOff = mActivity.getString(R.string.
- pref_camera_advanced_feature_value_chromaflash_off);
- String optiZoomOff = mActivity.getString(R.string.
- pref_camera_advanced_feature_value_optizoom_off);
- String reFocusOff = mActivity.getString(R.string.
- pref_camera_advanced_feature_value_refocus_off);
- String fssrOff = mActivity.getString(R.string.
- pref_camera_advanced_feature_value_FSSR_off);
- String truePortraitOff = mActivity.getString(R.string.
- pref_camera_advanced_feature_value_trueportrait_off);
- String multiTouchFocusOff = mActivity.getString(R.string.
- pref_camera_advanced_feature_value_multi_touch_focus_off);
- String stillMoreOff = mActivity.getString(R.string.
- pref_camera_advanced_feature_value_stillmore_off);
- String advancedFeatureOff = mActivity.getString(R.string.
- pref_camera_advanced_feature_value_none);
- if (notSame(pref, CameraSettings.KEY_QC_OPTI_ZOOM, optiZoomOff) ||
- notSame(pref, CameraSettings.KEY_QC_AF_BRACKETING, ubiFocusOff) ||
- notSame(pref, CameraSettings.KEY_QC_FSSR, fssrOff) ||
- notSame(pref, CameraSettings.KEY_QC_TP, truePortraitOff) ||
- notSame(pref, CameraSettings.KEY_QC_MULTI_TOUCH_FOCUS, multiTouchFocusOff) ||
- notSame(pref, CameraSettings.KEY_QC_STILL_MORE, stillMoreOff) ||
- notSame(pref, CameraSettings.KEY_QC_RE_FOCUS, reFocusOff) ||
- notSame(pref, CameraSettings.KEY_ADVANCED_FEATURES, advancedFeatureOff)) {
- RotateTextToast.makeText(mActivity, R.string.advanced_capture_disable_continuous_shot,
- Toast.LENGTH_LONG).show();
- }
//call generic onSharedPreferenceChanged
onSharedPreferenceChanged();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 09:15:54 +0000