Fix HQ mode change to allow return to regular photo mode.
Bug: 10848559
Change-Id: I6645bc17d29af664b9689e4bd05164100b155aa3
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index fc23876..98b52dd 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -431,6 +431,12 @@
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 @@
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);
}
}