OSDN Git Service

Update to use real L codename.
authorDianne Hackborn <hackbod@google.com>
Wed, 8 Oct 2014 16:37:44 +0000 (09:37 -0700)
committerDianne Hackborn <hackbod@google.com>
Wed, 8 Oct 2014 16:37:44 +0000 (09:37 -0700)
Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d

src/com/android/camera/one/v2/ImageCaptureManager.java
src/com/android/camera/one/v2/OneCameraZslImpl.java
src/com/android/camera/util/ApiHelper.java
src/com/android/camera/widget/FilmstripView.java

index 00f1b12..d84d957 100644 (file)
@@ -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 {
     /**
index aa03b88..63f6a90 100644 (file)
@@ -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");
 
index db27471..7133975 100644 (file)
@@ -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);
     }
 }
index 5774ab3..e0a1bac 100644 (file)
@@ -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);
     }