From be7dc6279dfe17cb93fab8cf88d1115966acb2e0 Mon Sep 17 00:00:00 2001 From: Ruben Brunk Date: Tue, 24 Sep 2013 23:14:41 -0700 Subject: Fix HQ mode change to allow return to regular photo mode. Bug: 10848559 Change-Id: I6645bc17d29af664b9689e4bd05164100b155aa3 --- src/com/android/camera/PhotoModule.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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); } } -- cgit v1.2.3