diff options
| author | Sascha Haeberling <haeberling@google.com> | 2013-10-03 12:10:48 -0700 |
|---|---|---|
| committer | Sascha Haeberling <haeberling@google.com> | 2013-10-03 12:33:24 -0700 |
| commit | 9bf0fd606a624138b8c1123d168f06a24c4d20a3 (patch) | |
| tree | 3a9689697841d06d349f657ce1fc77a1eb5a71f1 /src/com/android/camera/CameraSettings.java | |
| parent | 68fc363bd33a9e506ccfd1ffa330c4525a2734ce (diff) | |
| download | android_packages_apps_Snap-9bf0fd606a624138b8c1123d168f06a24c4d20a3.tar.gz android_packages_apps_Snap-9bf0fd606a624138b8c1123d168f06a24c4d20a3.tar.bz2 android_packages_apps_Snap-9bf0fd606a624138b8c1123d168f06a24c4d20a3.zip | |
Change icons and code from HQ to HDR+ mode.
Bug: 11047147
Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index fea544dec..3eb0a3256 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -61,7 +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_HDR_PLUS = "pref_camera_hdr_plus_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"; @@ -171,7 +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); + ListPreference cameraHdrPlus = group.findPreference(KEY_CAMERA_HDR_PLUS); // Since the screen could be loaded from different resources, we need // to check if the preference is available here @@ -222,9 +222,9 @@ public class CameraSettings { || !CameraUtil.isCameraHdrSupported(mParameters))) { removePreference(group, cameraHdr.getKey()); } - if (cameraHq != null && (!ApiHelper.HAS_CAMERA_HQ + if (cameraHdrPlus != null && (!ApiHelper.HAS_CAMERA_HDR_PLUS || !GcamHelper.hasGcamAsHDRMode())) { - removePreference(group, cameraHq.getKey()); + removePreference(group, cameraHdrPlus.getKey()); } } |