commit 55157d27305d06569f0bd7d3c47ec51855f87da4
author Dianne Hackborn <hackbod@google.com> Fri Oct 10 00:30:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 10 00:30:45 2014 +0000
tree eadbbdedac4cd319166950037e165d3169adb502
parent d014ce874af7d21e527213d65070af17905ecf36
parent cc93360812c822eb4cac8056a0848c74338b3776

am cc933608: am 2d440350: Update to use real L codename.

* commit 'cc93360812c822eb4cac8056a0848c74338b3776':
  Update to use real L codename.

src/com/android/camera/one/v2/ImageCaptureManager.java

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 {
     /**

src/com/android/camera/one/v2/OneCameraZslImpl.java

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");
 

src/com/android/camera/util/ApiHelper.java

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);
     }
 }

src/com/android/camera/widget/FilmstripView.java

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);
     }