diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-09-25 08:14:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-25 08:14:43 -0700 |
| commit | acc3396dfbf637189131c97ed5a6cafedb046d8b (patch) | |
| tree | 857d1019339d032f35e63d95083c44f45bd68a67 | |
| parent | 531e36df195d77cfb697b1602e4bbe147dec25d7 (diff) | |
| parent | be7dc6279dfe17cb93fab8cf88d1115966acb2e0 (diff) | |
| download | android_packages_apps_Snap-acc3396dfbf637189131c97ed5a6cafedb046d8b.tar.gz android_packages_apps_Snap-acc3396dfbf637189131c97ed5a6cafedb046d8b.tar.bz2 android_packages_apps_Snap-acc3396dfbf637189131c97ed5a6cafedb046d8b.zip | |
am be7dc627: Fix HQ mode change to allow return to regular photo mode.
* commit 'be7dc6279dfe17cb93fab8cf88d1115966acb2e0':
Fix HQ mode change to allow return to regular photo mode.
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index fc23876cc..98b52dded 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -431,6 +431,12 @@ public class PhotoModule stopPreview(); } + private void setGcamPreference(String value) { + mPreferences.edit() + .putString(CameraSettings.KEY_CAMERA_HQ, value) + .apply(); + } + private void setLocationPreference(String value) { mPreferences.edit() .putString(CameraSettings.KEY_RECORD_LOCATION, value) @@ -1749,8 +1755,11 @@ public class PhotoModule mCameraDevice.setParameters(mParameters); - // Switch to gcam module if HDR was selected + // Switch to gcam module if HQ was selected if (doModeSwitch) { + // Disable HQ so we don't reopen gcam when returning to the regular photo mode + setGcamPreference(mActivity.getString(R.string.setting_off_value)); + // Switch to gcam module mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX); } } |