summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlikaid <likaid@codeaurora.org>2015-07-14 16:26:25 +0800
committerSteve Kondik <steve@cyngn.com>2016-08-03 15:45:47 -0700
commit38a5e13ed498ded692830dfa97962edc54ed5195 (patch)
tree6589a3a373cc651bb1a0d348ca142d17308fee01
parent846dc6ad1013a28d60aa883ce3d219bf01167e86 (diff)
downloadandroid_packages_apps_Snap-38a5e13ed498ded692830dfa97962edc54ed5195.zip
android_packages_apps_Snap-38a5e13ed498ded692830dfa97962edc54ed5195.tar.gz
android_packages_apps_Snap-38a5e13ed498ded692830dfa97962edc54ed5195.tar.bz2
SnapdragonCamera: Fix the advanced features relative toast issue
The toast "Enable Advanced Capture will disable Continuous Shot" was shown every time when update the camera parameters, that made user confused. Move the toast to onSharedPreferenceChanged, show it only when turn on the advanced features. Change-Id: I34df735bb3928597093ba91a0ad10542014eeaae CRs-Fixed: 869438
-rw-r--r--src/com/android/camera/PhotoModule.java32
1 files changed, 30 insertions, 2 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 4208ca7..9419c37 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1887,8 +1887,6 @@ public class PhotoModule
null, null, null, colorEffect,
sceneMode, redeyeReduction, aeBracketing);
disableLongShot = true;
- RotateTextToast.makeText(mActivity, R.string.advanced_capture_disable_continuous_shot,
- Toast.LENGTH_LONG).show();
}
// If scene mode is set, for white balance and focus mode
@@ -4430,6 +4428,36 @@ 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_CHROMA_FLASH, chromaFlashOff) ||
+ 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();
}