diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-09-24 18:58:34 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-09-24 21:42:10 -0700 |
| commit | 98f38bb04daa3db49a072718cd8b5005b8b73af1 (patch) | |
| tree | 09f64d1dfdf0837a3f042fae987de58ccc54c625 /src/com/android/camera/CameraSettings.java | |
| parent | 4601f5d987ad2f57db6b1b65a716f00308e5ae99 (diff) | |
| download | android_packages_apps_Snap-98f38bb04daa3db49a072718cd8b5005b8b73af1.tar.gz android_packages_apps_Snap-98f38bb04daa3db49a072718cd8b5005b8b73af1.tar.bz2 android_packages_apps_Snap-98f38bb04daa3db49a072718cd8b5005b8b73af1.zip | |
Add HQ option and use it to switch to GCam.
Bug: 10430748
Bug: 10785988
Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 19d0fda56..6faabcd5b 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -61,6 +61,7 @@ public class CameraSettings { public static final String KEY_VIDEO_EFFECT = "pref_video_effect_key"; public static final String KEY_CAMERA_ID = "pref_camera_id_key"; public static final String KEY_CAMERA_HDR = "pref_camera_hdr_key"; + public static final String KEY_CAMERA_HQ = "pref_camera_hq_key"; public static final String KEY_CAMERA_FIRST_USE_HINT_SHOWN = "pref_camera_first_use_hint_shown_key"; public static final String KEY_VIDEO_FIRST_USE_HINT_SHOWN = "pref_video_first_use_hint_shown_key"; public static final String KEY_PHOTOSPHERE_PICTURESIZE = "pref_photosphere_picturesize_key"; @@ -170,6 +171,7 @@ public class CameraSettings { group.findPreference(KEY_VIDEOCAMERA_FLASH_MODE); ListPreference videoEffect = group.findPreference(KEY_VIDEO_EFFECT); ListPreference cameraHdr = group.findPreference(KEY_CAMERA_HDR); + ListPreference cameraHq = group.findPreference(KEY_CAMERA_HQ); // Since the screen could be loaded from different resources, we need // to check if the preference is available here @@ -216,10 +218,14 @@ public class CameraSettings { if (videoEffect != null) { filterUnsupportedOptions(group, videoEffect, null); } - if (cameraHdr != null && !GcamHelper.hasGcamAsHDRMode() - && (!ApiHelper.HAS_CAMERA_HDR || !CameraUtil.isCameraHdrSupported(mParameters))) { + if (cameraHdr != null && !ApiHelper.HAS_CAMERA_HDR + || !CameraUtil.isCameraHdrSupported(mParameters)) { removePreference(group, cameraHdr.getKey()); } + if (cameraHq != null && (!ApiHelper.HAS_CAMERA_HQ + | !GcamHelper.hasGcamAsHDRMode())) { + removePreference(group, cameraHq.getKey()); + } } private void buildExposureCompensation( |