summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoMenu.java
diff options
context:
space:
mode:
authorSanthosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>2014-10-15 12:39:00 +0530
committerSanthosh Kumar Thimmanna Bhattar <sthim@codeaurora.org>2014-10-15 12:39:00 +0530
commitf94401fc428b56b34d49b073e16da5cb135c7f0d (patch)
tree0358fe1c90b4acb25f061508299f363da1ecd474 /src/com/android/camera/PhotoMenu.java
parentd7810337255f08f3c89e2fb02ca393fc2997ca8d (diff)
downloadandroid_packages_apps_Snap-f94401fc428b56b34d49b073e16da5cb135c7f0d.tar.gz
android_packages_apps_Snap-f94401fc428b56b34d49b073e16da5cb135c7f0d.tar.bz2
android_packages_apps_Snap-f94401fc428b56b34d49b073e16da5cb135c7f0d.zip
Camera2: Disable advance features when continuous shot mode is enabled
- Camera is getting stoppped in continuous shot mode when advance feature like ubifocus is enabled. - Fix is to disable advance features when continuous shot mode is enabled and vice versa Change-Id: Icc47dfd8a3d617b46794ae8abfd02e72b8e0b682
Diffstat (limited to 'src/com/android/camera/PhotoMenu.java')
-rw-r--r--src/com/android/camera/PhotoMenu.java23
1 files changed, 23 insertions, 0 deletions
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);
}