From: Dianne Hackborn <hackbod@google.com>
Date: Wed, 8 Oct 2014 16:37:44 +0000 (-0700)
Subject: Update to use real L codename.
X-Git-Tag: android-x86-7.1-r1~25^2~45^2~3^2~2^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2d4403500d0bb55794aecbe9a33a03dd09f8ea0a;p=android-x86%2Fpackages-apps-Camera2.git

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