diff options
| author | Manish Kumar <manishku@codeaurora.org> | 2013-10-30 19:55:01 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2013-10-31 19:40:37 -0600 |
| commit | a9942e8aa6b94f65caed94daa577249da48fa4a8 (patch) | |
| tree | 37bd5440ca9f5c733000b7f84d7b557a4dd2280d /src/com/android/camera/CameraSettings.java | |
| parent | 6b39715d4861baff73dcb7c55b41ff298b39aa15 (diff) | |
| download | android_packages_apps_Snap-a9942e8aa6b94f65caed94daa577249da48fa4a8.tar.gz android_packages_apps_Snap-a9942e8aa6b94f65caed94daa577249da48fa4a8.tar.bz2 android_packages_apps_Snap-a9942e8aa6b94f65caed94daa577249da48fa4a8.zip | |
Camera2: Fix compilation issues
Fix compilation issues
Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21
(cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4)
(cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)
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 74877541d..243f1e35d 100644 --- a/src/com/android/camera/CameraSettings.java +++ b/src/com/android/camera/CameraSettings.java @@ -1,4 +1,5 @@ -/* Copyright (C) 2009 The Android Open Source Project +/* + * Copyright (C) 2009 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,6 +65,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"; @@ -392,9 +394,8 @@ 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 disMode = group.findPreference(KEY_DIS); - + 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 @@ -447,7 +448,6 @@ public class CameraSettings { || !CameraUtil.isCameraHdrSupported(mParameters))) { removePreference(group, cameraHdr.getKey()); } - int frontCameraId = CameraHolder.instance().getFrontCameraId(); boolean isFrontCamera = (frontCameraId == mCameraId); if (cameraHdrPlus != null && (!ApiHelper.HAS_CAMERA_HDR_PLUS || |