diff options
| -rw-r--r-- | res/values/qcomstrings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 11 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 15 |
3 files changed, 30 insertions, 0 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 79538149f..ab5381451 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -662,5 +662,9 @@ <!-- longshot value --> <string name="pref_camera_longshot_default" translatable="false">off</string> <string name="pref_camera_longshot_title">Continuous Shot</string> + + <!-- Toast showing non-supported functionality for flash in AE bracket --> + <string name="flash_aebracket_message">Flash is not supported in AE-Bracket Mode</string> + </resources> 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 b8ab9b8ac..813a02a0d 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, @@ -2634,6 +2642,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() { |