diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-08 09:37:44 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-10-08 09:37:44 -0700 |
| commit | 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a (patch) | |
| tree | 79efe14575202213012359cf35af8aee32b10ffa | |
| parent | 7ba23fed935fa796c9c76b16c9bae79bf3f8b969 (diff) | |
| download | android_packages_apps_Camera2-2d4403500d0bb55794aecbe9a33a03dd09f8ea0a.tar.gz android_packages_apps_Camera2-2d4403500d0bb55794aecbe9a33a03dd09f8ea0a.tar.bz2 android_packages_apps_Camera2-2d4403500d0bb55794aecbe9a33a03dd09f8ea0a.zip | |
Update to use real L codename.
Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d
4 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/one/v2/ImageCaptureManager.java b/src/com/android/camera/one/v2/ImageCaptureManager.java index 00f1b1215..d84d95712 100644 --- a/src/com/android/camera/one/v2/ImageCaptureManager.java +++ b/src/com/android/camera/one/v2/ImageCaptureManager.java @@ -55,7 +55,7 @@ import java.util.concurrent.atomic.AtomicInteger; * This also manages the lifecycle of {@link Image}s within the application as * they are passed in from the lower-level camera2 API. */ -@TargetApi(Build.VERSION_CODES.L) +@TargetApi(Build.VERSION_CODES.LOLLIPOP) public class ImageCaptureManager extends CameraCaptureSession.CaptureCallback implements ImageReader.OnImageAvailableListener { /** diff --git a/src/com/android/camera/one/v2/OneCameraZslImpl.java b/src/com/android/camera/one/v2/OneCameraZslImpl.java index aa03b8898..63f6a90e0 100644 --- a/src/com/android/camera/one/v2/OneCameraZslImpl.java +++ b/src/com/android/camera/one/v2/OneCameraZslImpl.java @@ -75,7 +75,7 @@ import java.util.concurrent.atomic.AtomicLong; * shutter lag.<br> * TODO: Determine what the maximum number of full YUV capture frames is. */ -@TargetApi(Build.VERSION_CODES.L) +@TargetApi(Build.VERSION_CODES.LOLLIPOP) public class OneCameraZslImpl extends AbstractOneCamera { private static final Tag TAG = new Tag("OneCameraZslImpl2"); diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java index db2747165..713397588 100644 --- a/src/com/android/camera/util/ApiHelper.java +++ b/src/com/android/camera/util/ApiHelper.java @@ -77,7 +77,7 @@ public class ApiHelper { } public static boolean isLOrHigher() { - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.L + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP || "L".equals(Build.VERSION.CODENAME); } } diff --git a/src/com/android/camera/widget/FilmstripView.java b/src/com/android/camera/widget/FilmstripView.java index 5774ab397..e0a1bac90 100644 --- a/src/com/android/camera/widget/FilmstripView.java +++ b/src/com/android/camera/widget/FilmstripView.java @@ -953,7 +953,7 @@ public class FilmstripView extends ViewGroup { } } - @TargetApi(Build.VERSION_CODES.L) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void setMaxElevation(View v) { v.setElevation(Float.MAX_VALUE); } |