diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-10-18 11:50:29 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-10-18 11:50:29 -0700 |
| commit | b17617efd4fdd4067990957324ac7ae9c6c14eab (patch) | |
| tree | 4392be110185c4658c5baa63d0c3ca08fe4c3a4d | |
| parent | a324d2502f165c8d3640607e08587af0be0f9f7b (diff) | |
| parent | f94401fc428b56b34d49b073e16da5cb135c7f0d (diff) | |
| download | android_packages_apps_Snap-b17617efd4fdd4067990957324ac7ae9c6c14eab.tar.gz android_packages_apps_Snap-b17617efd4fdd4067990957324ac7ae9c6c14eab.tar.bz2 android_packages_apps_Snap-b17617efd4fdd4067990957324ac7ae9c6c14eab.zip | |
Merge "Camera2: Disable advance features when continuous shot mode is enabled"
| -rw-r--r-- | res/values/qcomstrings.xml | 8 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 23 |
2 files changed, 31 insertions, 0 deletions
diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml index 8f2368e6e..891e4c525 100644 --- a/res/values/qcomstrings.xml +++ b/res/values/qcomstrings.xml @@ -791,5 +791,13 @@ <string name="pref_camera_video_rotation_entry_90">90</string> <string name="pref_camera_video_rotation_entry_180">180</string> <string name="pref_camera_video_rotation_entry_270">270</string> + + <!-- Continous shot enable message --> + <string name="longshot_enable_message"> + Advance features are not supported in continuous shot mode</string> + <!-- Advance features enable message --> + <string name="advance_feature_enable_msg"> + Continuous shot is not supported when advance features are enabled</string> + </resources> diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index c4e8f8350..096a8524e 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -455,6 +455,29 @@ public class PhotoMenu extends PieController Toast.makeText(mActivity, R.string.flash_aebracket_message,Toast.LENGTH_SHORT).show(); } + } else if (notSame(pref, CameraSettings.KEY_LONGSHOT, mSettingOff)) { + ListPreference advancefeaturePref = + mPreferenceGroup.findPreference(CameraSettings.KEY_ADVANCED_FEATURES); + if (advancefeaturePref != null) { + if (notSame(advancefeaturePref, CameraSettings.KEY_ADVANCED_FEATURES, + mActivity.getString(R.string.pref_camera_advanced_feature_default))) { + Toast.makeText(mActivity, R.string.longshot_enable_message, + Toast.LENGTH_LONG).show(); + } + setPreference(CameraSettings.KEY_ADVANCED_FEATURES, + mActivity.getString(R.string.pref_camera_advanced_feature_default)); + } + } else if (notSame(pref, CameraSettings.KEY_ADVANCED_FEATURES, + mActivity.getString(R.string.pref_camera_advanced_feature_default))) { + ListPreference longshotPref = + mPreferenceGroup.findPreference(CameraSettings.KEY_LONGSHOT); + if (longshotPref != null ) { + if (notSame(longshotPref, CameraSettings.KEY_LONGSHOT, mSettingOff)) { + Toast.makeText(mActivity, R.string.advance_feature_enable_msg, + Toast.LENGTH_LONG).show(); + } + setPreference(CameraSettings.KEY_LONGSHOT, mSettingOff); + } } super.onSettingChanged(pref); } |