diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-10-03 20:47:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-03 20:47:44 +0000 |
| commit | 238799e97077ee72a53a5a04d9d3068aebb82bf7 (patch) | |
| tree | 9a7ceb2e6f13a16014531ef3587e15611bf0722a /src/com/android/camera/PhotoModule.java | |
| parent | 5bca6f4cf43732edf459010f418d3719e07f3c8a (diff) | |
| parent | 9bf0fd606a624138b8c1123d168f06a24c4d20a3 (diff) | |
| download | android_packages_apps_Snap-238799e97077ee72a53a5a04d9d3068aebb82bf7.tar.gz android_packages_apps_Snap-238799e97077ee72a53a5a04d9d3068aebb82bf7.tar.bz2 android_packages_apps_Snap-238799e97077ee72a53a5a04d9d3068aebb82bf7.zip | |
Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 3f6cd1a89..c0693deea 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -429,12 +429,6 @@ 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) @@ -1623,13 +1617,13 @@ public class PhotoModule String onValue = mActivity.getString(R.string.setting_on_value); String hdr = mPreferences.getString(CameraSettings.KEY_CAMERA_HDR, mActivity.getString(R.string.pref_camera_hdr_default)); - String hq = mPreferences.getString(CameraSettings.KEY_CAMERA_HQ, - mActivity.getString(R.string.pref_camera_hq_default)); + String hdrPlus = mPreferences.getString(CameraSettings.KEY_CAMERA_HDR_PLUS, + mActivity.getString(R.string.pref_camera_hdr_plus_default)); boolean hdrOn = onValue.equals(hdr); - boolean hqOn = onValue.equals(hq); + boolean hdrPlusOn = onValue.equals(hdrPlus); boolean doGcamModeSwitch = false; - if (hqOn && GcamHelper.hasGcamCapture()) { + if (hdrPlusOn && GcamHelper.hasGcamCapture()) { // Kick off mode switch to gcam. doGcamModeSwitch = true; } else { @@ -1750,7 +1744,7 @@ public class PhotoModule mCameraDevice.setParameters(mParameters); - // Switch to gcam module if HQ was selected + // Switch to gcam module if HDR+ was selected if (doModeSwitch) { mActivity.onModuleSelected(ModuleSwitcher.GCAM_MODULE_INDEX); } |