Merge "Camera2: Make Continuous Shot off when HDR on."

4 files changed, 19 insertions, 1 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 86195a52c..c6a5d1b16 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -492,4 +492,5 @@
     <string name="hdr_enable_message">HDR启用后，只支持自动场景模式</string>
     <string name="scene_enable_message">HDR不支持自动场景以外模式</string>
 
+    <string name="HDR_disable_continuous_shot">"开启HDR将禁用连拍功能"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 370254961..fc183f643 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -413,6 +413,9 @@
     <!-- Toast after trying to select a setting that is not allowed to change in scene mode [CHAR LIMIT=NONE] -->
     <string name="not_selectable_in_scene_mode">Not selectable in scene mode.</string>
 
+    <!-- Toast after enable HDR function to inform Continuous Shot has disabled -->
+    <string name="HDR_disable_continuous_shot">Enable HDR will disable Continuous Shot.</string>
+
     <!-- Exposure settings in preference -->
     <string name="pref_exposure_title">Exposure</string>
     <string name="pref_exposure_default" translatable="false">0</string>
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index e72411da4..1edb3b529 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1452,6 +1452,10 @@ public class PhotoModule
                     Integer.toString(mParameters.getSharpness()),
                     colorEffect,
                     sceneMode, redeyeReduction, aeBracketing);
+            if (CameraUtil.SCENE_MODE_HDR.equals(mSceneMode)) {
+                mUI.overrideSettings(CameraSettings.KEY_LONGSHOT,
+                        mActivity.getString(R.string.setting_off_value));
+            }
         } else if (mFocusManager.isZslEnabled()) {
             focusMode = mParameters.getFocusMode();
             overrideCameraSettings(flashMode, null, focusMode,
@@ -1471,7 +1475,9 @@ public class PhotoModule
             mUI.overrideSettings(CameraSettings.KEY_FLASH_MODE, fMode);
             mParameters.setFlashMode(fMode);
         }
-
+        if (Parameters.SCENE_MODE_AUTO.equals(mSceneMode)) {
+            mUI.overrideSettings(CameraSettings.KEY_LONGSHOT, null);
+        }
     }
 
     private void overrideCameraSettings(final String flashMode,
diff --git a/src/com/android/camera/PieController.java b/src/com/android/camera/PieController.java
index ba4988379..b55fc3551 100644
--- a/src/com/android/camera/PieController.java
+++ b/src/com/android/camera/PieController.java
@@ -19,12 +19,14 @@ package com.android.camera;
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.android.camera.CameraPreference.OnPreferenceChangedListener;
 import com.android.camera.drawable.TextDrawable;
 import com.android.camera.ui.PieItem;
 import com.android.camera.ui.PieItem.OnClickListener;
 import com.android.camera.ui.PieRenderer;
+import com.android.camera2.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -167,6 +169,12 @@ public class PieController {
                     CharSequence[] values = pref.getEntryValues();
                     index = (index + 1) % values.length;
                     pref.setValueIndex(index);
+                    // when enable HDR,inform to disable Continuous Shot
+                    if (index == 1 && prefKey == CameraSettings.KEY_CAMERA_HDR)
+                    {
+                        Toast.makeText(mActivity, R.string.HDR_disable_continuous_shot,
+                                Toast.LENGTH_LONG).show();
+                    }
                     fitem.setLabel(pref.getLabels()[index]);
                     fitem.setImageResource(mActivity,
                             ((IconListPreference) pref).getLargeIconIds()[index]);