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

2 files changed, 31 insertions, 0 deletions

diff --git a/res/values/qcomstrings.xml b/res/values/qcomstrings.xml
index 9cd10d24f..3110ce948 100644
--- a/res/values/qcomstrings.xml
+++ b/res/values/qcomstrings.xml
@@ -788,5 +788,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);
     }