diff options
| -rw-r--r-- | src/com/android/camera/CountDownTimerPreference.java | 4 | ||||
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/camera/CountDownTimerPreference.java b/src/com/android/camera/CountDownTimerPreference.java index 3d5f3a4c7..57820ac76 100644 --- a/src/com/android/camera/CountDownTimerPreference.java +++ b/src/com/android/camera/CountDownTimerPreference.java @@ -23,7 +23,7 @@ import org.codeaurora.snapcam.R; public class CountDownTimerPreference extends IconListPreference { private static final int[] DURATIONS = { - 0, 1, 2, 3, 4, 5, 10, 15, 20, 30, 60 + 0, 2, 5, 10 }; public CountDownTimerPreference(Context context, AttributeSet attrs) { super(context, attrs); @@ -39,7 +39,7 @@ public class CountDownTimerPreference extends IconListPreference { entries[0] = context.getString(R.string.setting_off); // Off } else { entries[i] = context.getResources() - .getQuantityString(R.plurals.pref_camera_timer_entry, i, + .getQuantityString(R.plurals.pref_camera_timer_entry, DURATIONS[i], DURATIONS[i]); } } diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index f6cd60ba5..4d311bad3 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -539,6 +539,9 @@ public class PhotoModule } private void onPreviewStarted() { + if (mCameraState == SNAPSHOT_IN_PROGRESS) { + return; + } mUI.hidePreviewCover(); setCameraState(IDLE); mFocusManager.onPreviewStarted(); @@ -3115,7 +3118,7 @@ public class PhotoModule String auto_hdr = mPreferences.getString(CameraSettings.KEY_AUTO_HDR, mActivity.getString(R.string.pref_camera_hdr_default)); if (CameraUtil.isAutoHDRSupported(mParameters)) { - mParameters.setAutoHDRMode(auto_hdr); + mParameters.set("auto-hdr-enable",auto_hdr); if (auto_hdr.equals("enable")) { mActivity.runOnUiThread(new Runnable() { public void run() { |