summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PieController.java
diff options
context:
space:
mode:
authorkaiyiz <kaiyiz@codeaurora.org>2014-05-28 17:01:33 +0800
committerkaiyiz <kaiyiz@codeaurora.org>2014-05-28 17:06:25 +0800
commit0ca51ec7d56c89205a99996c74d1e3e9d36c85ed (patch)
tree68bc62bd704b286f3db774491a72a8d2ebef56a6 /src/com/android/camera/PieController.java
parent0542ce1f6f50af1ef45d8623ff3cdc2cc3a92f6b (diff)
downloadandroid_packages_apps_Snap-0ca51ec7d56c89205a99996c74d1e3e9d36c85ed.tar.gz
android_packages_apps_Snap-0ca51ec7d56c89205a99996c74d1e3e9d36c85ed.tar.bz2
android_packages_apps_Snap-0ca51ec7d56c89205a99996c74d1e3e9d36c85ed.zip
Camera2: Make Continuous Shot off when HDR on.
The HDR function can not existed with the Continuous Shot function,so change code to achieve the function like that when we open HDR function ,make the Continuous Shot off, and we close HDR,make the Continuous Shot on. CRs-fixed: 667319 Change-Id: I75ab5d268c1feb2d95ff6a6b0f35dcf96d8cc953
Diffstat (limited to 'src/com/android/camera/PieController.java')
-rw-r--r--src/com/android/camera/PieController.java8
1 files changed, 8 insertions, 0 deletions
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]);