| commit | 2d4403500d0bb55794aecbe9a33a03dd09f8ea0a | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Oct 08 09:37:44 2014 -0700 |
| committer | Dianne Hackborn <hackbod@google.com> | Wed Oct 08 09:37:44 2014 -0700 |
| tree | 79efe14575202213012359cf35af8aee32b10ffa | |
| parent | 7ba23fed935fa796c9c76b16c9bae79bf3f8b969 [diff] |
Update to use real L codename. Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d
diff --git a/src/com/android/camera/one/v2/ImageCaptureManager.java b/src/com/android/camera/one/v2/ImageCaptureManager.java index 00f1b12..d84d957 100644 --- a/src/com/android/camera/one/v2/ImageCaptureManager.java +++ b/src/com/android/camera/one/v2/ImageCaptureManager.java
@@ -55,7 +55,7 @@ * 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 aa03b88..63f6a90 100644 --- a/src/com/android/camera/one/v2/OneCameraZslImpl.java +++ b/src/com/android/camera/one/v2/OneCameraZslImpl.java
@@ -75,7 +75,7 @@ * 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 db27471..7133975 100644 --- a/src/com/android/camera/util/ApiHelper.java +++ b/src/com/android/camera/util/ApiHelper.java
@@ -77,7 +77,7 @@ } 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 5774ab3..e0a1bac 100644 --- a/src/com/android/camera/widget/FilmstripView.java +++ b/src/com/android/camera/widget/FilmstripView.java
@@ -953,7 +953,7 @@ } } - @TargetApi(Build.VERSION_CODES.L) + @TargetApi(Build.VERSION_CODES.LOLLIPOP) private void setMaxElevation(View v) { v.setElevation(Float.MAX_VALUE); }