diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-03 06:03:44 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-03 06:03:44 -0700 |
commit | 170107fbc4346f960d8d3d5011e6ae5229198eb5 (patch) | |
tree | f9a1bf313cea0a43c610a4eaf5f68fe556b0bea3 /src | |
parent | 1e1660788569a7adc6416672ff55010743dfacaf (diff) | |
parent | 0ca51ec7d56c89205a99996c74d1e3e9d36c85ed (diff) | |
download | android_packages_apps_Snap-170107fbc4346f960d8d3d5011e6ae5229198eb5.tar.gz android_packages_apps_Snap-170107fbc4346f960d8d3d5011e6ae5229198eb5.tar.bz2 android_packages_apps_Snap-170107fbc4346f960d8d3d5011e6ae5229198eb5.zip |
Merge "Camera2: Make Continuous Shot off when HDR on."
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 | ||||
-rw-r--r-- | src/com/android/camera/PieController.java | 8 |
2 files changed, 15 insertions, 1 deletions
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]); |