diff options
Diffstat (limited to 'src/com/android/camera')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoMenu.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 12 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index c6fad5ca0..243a1ff8f 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -106,6 +106,8 @@ public class CameraSettings { public static final String KEY_FACE_RECOGNITION = "pref_camera_facerc_key"; public static final String KEY_DIS = "pref_camera_dis_key"; + public static final String KEY_LONGSHOT = "pref_camera_longshot_key"; + private static final String KEY_QC_SUPPORTED_AE_BRACKETING_MODES = "ae-bracket-hdr-values"; private static final String KEY_QC_SUPPORTED_AF_BRACKETING_MODES = "af-bracket-values"; private static final String KEY_QC_SUPPORTED_CF_MODES = "chroma-flash-values"; diff --git a/src/com/android/camera/PhotoMenu.java b/src/com/android/camera/PhotoMenu.java index 61b74bed4..ce2511267 100644 --- a/src/com/android/camera/PhotoMenu.java +++ b/src/com/android/camera/PhotoMenu.java @@ -102,7 +102,8 @@ public class PhotoMenu extends PieController CameraSettings.KEY_ZSL, CameraSettings.KEY_TIMER, CameraSettings.KEY_TIMER_SOUND_EFFECTS, - CameraSettings.KEY_CAMERA_SAVEPATH + CameraSettings.KEY_CAMERA_SAVEPATH, + CameraSettings.KEY_LONGSHOT }; mOtherKeys2 = new String[] { diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 9f95154c7..7e1ac9088 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1741,10 +1741,14 @@ public class PhotoModule @Override public void onShutterButtonLongClick() { if ((null != mCameraDevice) && ((mCameraState == IDLE) || (mCameraState == FOCUSING))) { - boolean enable = false; - enable = SystemProperties.getBoolean(PERSIST_LONG_ENABLE, false); - if ( enable ) { - enable = SystemProperties.getBoolean(PERSIST_LONG_SAVE, false); + //Add on/off Menu for longshot + String longshot_enable = mPreferences.getString( + CameraSettings.KEY_LONGSHOT, + mActivity.getString(R.string.pref_camera_longshot_default)); + + Log.d(TAG, "longshot_enable = " + longshot_enable); + if (longshot_enable.equals("on")) { + boolean enable = SystemProperties.getBoolean(PERSIST_LONG_SAVE, false); mLongshotSave = enable; mCameraDevice.setLongshot(true); setCameraState(PhotoController.LONGSHOT); |