Merge "Ignore MinMaxConstant lint warning." into androidx-master-dev

7 files changed, 31 insertions, 31 deletions

diff --git a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/ImageCaptureTest.java b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/ImageCaptureTest.java
index f4200f7ba96..933034d87c7 100644
--- a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/ImageCaptureTest.java
+++ b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/ImageCaptureTest.java
@@ -247,7 +247,7 @@ public final class ImageCaptureTest {
     @Test
     public void canCaptureMultipleImagesWithMaxQuality() {
         ImageCapture useCase = new ImageCapture.Builder()
-                .setCaptureMode(CaptureMode.MAX_QUALITY)
+                .setCaptureMode(CaptureMode.MAXIMIZE_QUALITY)
                 .build();
         mInstrumentation.runOnMainSync(
                 () -> {
diff --git a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/impl/Camera2ImplCameraXTest.java b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/impl/Camera2ImplCameraXTest.java
index 47b520c539a..f8504765a75 100644
--- a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/impl/Camera2ImplCameraXTest.java
+++ b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/impl/Camera2ImplCameraXTest.java
@@ -428,7 +428,7 @@ public final class Camera2ImplCameraXTest {
         ImageAnalysis useCase0 = builder.build();
 
         ImageCapture useCase1 = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MAX_QUALITY)
+                .setCaptureMode(ImageCapture.CaptureMode.MAXIMIZE_QUALITY)
                 .build();
 
         mInstrumentation.runOnMainSync(new Runnable() {
@@ -460,7 +460,7 @@ public final class Camera2ImplCameraXTest {
         ImageAnalysis useCase0 = builder.build();
 
         ImageCapture useCase1 = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MAX_QUALITY)
+                .setCaptureMode(ImageCapture.CaptureMode.MAXIMIZE_QUALITY)
                 .build();
 
         mInstrumentation.runOnMainSync(new Runnable() {
diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/impl/ImageCaptureOptionUnpacker.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/impl/ImageCaptureOptionUnpacker.java
index b41e3359421..3197135d04d 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/impl/ImageCaptureOptionUnpacker.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/impl/ImageCaptureOptionUnpacker.java
@@ -70,12 +70,12 @@ final class ImageCaptureOptionUnpacker extends Camera2CaptureOptionUnpacker {
                 || "Pixel 3".equals(mDeviceProperties.model()))) {
             if (mDeviceProperties.sdkVersion() >= Build.VERSION_CODES.O) {
                 switch (captureMode) {
-                    case CaptureMode.MAX_QUALITY:
+                    case CaptureMode.MAXIMIZE_QUALITY:
                         // enable ZSL to make sure HDR+ is enabled
                         builder.setCaptureRequestOption(
                                 CaptureRequest.CONTROL_ENABLE_ZSL, true);
                         break;
-                    case CaptureMode.MIN_LATENCY:
+                    case CaptureMode.MINIMIZE_LATENCY:
                         // disable ZSL to turn off HDR+
                         builder.setCaptureRequestOption(
                                 CaptureRequest.CONTROL_ENABLE_ZSL, false);
diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/impl/ImageCaptureOptionUnpackerTest.java b/camera/camera-camera2/src/test/java/androidx/camera/camera2/impl/ImageCaptureOptionUnpackerTest.java
index a735592d010..a0793ef6c94 100644
--- a/camera/camera-camera2/src/test/java/androidx/camera/camera2/impl/ImageCaptureOptionUnpackerTest.java
+++ b/camera/camera-camera2/src/test/java/androidx/camera/camera2/impl/ImageCaptureOptionUnpackerTest.java
@@ -108,7 +108,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithValidPixel2AndMinLatency() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MIN_LATENCY)
+                .setCaptureMode(ImageCapture.CaptureMode.MINIMIZE_LATENCY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_PIXEL_2_API26);
@@ -125,7 +125,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithValidPixel2AndMaxQuality() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MAX_QUALITY)
+                .setCaptureMode(ImageCapture.CaptureMode.MAXIMIZE_QUALITY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_PIXEL_2_API26);
@@ -142,7 +142,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithPixel2NotSupportApiLevelAndMinLatency() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MIN_LATENCY)
+                .setCaptureMode(ImageCapture.CaptureMode.MINIMIZE_LATENCY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_PIXEL_2_NOT_SUPPORT_API);
@@ -159,7 +159,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithPixel2NotSupportApiLevelAndMaxQuality() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MAX_QUALITY)
+                .setCaptureMode(ImageCapture.CaptureMode.MAXIMIZE_QUALITY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_PIXEL_2_NOT_SUPPORT_API);
@@ -176,7 +176,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithValidPixel3AndMinLatency() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MIN_LATENCY)
+                .setCaptureMode(ImageCapture.CaptureMode.MINIMIZE_LATENCY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_PIXEL_3_API26);
@@ -193,7 +193,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithValidPixel3AndMaxQuality() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MAX_QUALITY)
+                .setCaptureMode(ImageCapture.CaptureMode.MAXIMIZE_QUALITY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_PIXEL_3_API26);
@@ -210,7 +210,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithPixel3NotSupportApiLevelAndMinLatency() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MIN_LATENCY)
+                .setCaptureMode(ImageCapture.CaptureMode.MINIMIZE_LATENCY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_PIXEL_3_NOT_SUPPORT_API);
@@ -227,7 +227,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithPixel3NotSupportApiLevelAndMaxQuality() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MAX_QUALITY)
+                .setCaptureMode(ImageCapture.CaptureMode.MAXIMIZE_QUALITY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_PIXEL_3_NOT_SUPPORT_API);
@@ -244,7 +244,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithNotSupportManufacture() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MAX_QUALITY)
+                .setCaptureMode(ImageCapture.CaptureMode.MAXIMIZE_QUALITY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_NOT_GOOGLE);
@@ -261,7 +261,7 @@ public final class ImageCaptureOptionUnpackerTest {
     public void unpackWithNotSupportModel() {
         CaptureConfig.Builder captureBuilder = new CaptureConfig.Builder();
         ImageCaptureConfig imageCaptureConfig = new ImageCapture.Builder()
-                .setCaptureMode(ImageCapture.CaptureMode.MAX_QUALITY)
+                .setCaptureMode(ImageCapture.CaptureMode.MAXIMIZE_QUALITY)
                 .getUseCaseConfig();
 
         mUnpacker.setDeviceProperty(PROPERTIES_NOT_SUPPORT_MODEL);
diff --git a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
index d9c9ebd174a..5e6a6c8b10e 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
@@ -229,9 +229,9 @@ public class ImageCapture extends UseCase {
 
         mIoExecutor = mConfig.getIoExecutor(CameraXExecutors.ioExecutor());
 
-        if (mCaptureMode == CaptureMode.MAX_QUALITY) {
+        if (mCaptureMode == CaptureMode.MAXIMIZE_QUALITY) {
             mEnableCheck3AConverged = true; // check 3A convergence in MAX_QUALITY mode
-        } else if (mCaptureMode == CaptureMode.MIN_LATENCY) {
+        } else if (mCaptureMode == CaptureMode.MINIMIZE_LATENCY) {
             mEnableCheck3AConverged = false; // skip 3A convergence in MIN_LATENCY mode
         }
 
@@ -1144,20 +1144,20 @@ public class ImageCapture extends UseCase {
      * Capture mode options for ImageCapture. A picture will always be taken regardless of
      * mode, and the mode will be used on devices that support it.
      */
-    @IntDef({CaptureMode.MAX_QUALITY, CaptureMode.MIN_LATENCY})
+    @IntDef({CaptureMode.MAXIMIZE_QUALITY, CaptureMode.MINIMIZE_LATENCY})
     @Retention(RetentionPolicy.SOURCE)
     public @interface CaptureMode {
         /**
          * Optimizes capture pipeline to prioritize image quality over latency. When the capture
          * mode is set to MAX_QUALITY, images may take longer to capture.
          */
-        int MAX_QUALITY = 0;
+        int MAXIMIZE_QUALITY = 0;
         /**
          * Optimizes capture pipeline to prioritize latency over image quality. When the capture
          * mode is set to MIN_LATENCY, images may capture faster but the image quality may be
          * reduced.
          */
-        int MIN_LATENCY = 1;
+        int MINIMIZE_LATENCY = 1;
     }
 
     /** Listener containing callbacks for image file I/O events. */
@@ -1246,7 +1246,7 @@ public class ImageCapture extends UseCase {
     public static final class Defaults
             implements ConfigProvider<ImageCaptureConfig> {
         @CaptureMode
-        private static final int DEFAULT_CAPTURE_MODE = CaptureMode.MIN_LATENCY;
+        private static final int DEFAULT_CAPTURE_MODE = CaptureMode.MINIMIZE_LATENCY;
         @FlashMode
         private static final int DEFAULT_FLASH_MODE = FlashMode.OFF;
         private static final int DEFAULT_SURFACE_OCCUPANCY_PRIORITY = 4;
@@ -1633,11 +1633,11 @@ public class ImageCapture extends UseCase {
         /**
          * Sets the image capture mode.
          *
-         * <p>Valid capture modes are {@link CaptureMode#MIN_LATENCY}, which prioritizes latency
-         * over image quality, or {@link CaptureMode#MAX_QUALITY}, which prioritizes image quality
-         * over latency.
+         * <p>Valid capture modes are {@link CaptureMode#MINIMIZE_LATENCY}, which prioritizes
+         * latency over image quality, or {@link CaptureMode#MAXIMIZE_QUALITY}, which prioritizes
+         * image quality over latency.
          *
-         * <p>If not set, the capture mode will default to {@link CaptureMode#MIN_LATENCY}.
+         * <p>If not set, the capture mode will default to {@link CaptureMode#MINIMIZE_LATENCY}.
          *
          * @param captureMode The requested image capture mode.
          * @return The current Builder.
diff --git a/camera/integration-tests/coretestapp/src/main/java/androidx/camera/integration/core/CameraXActivity.java b/camera/integration-tests/coretestapp/src/main/java/androidx/camera/integration/core/CameraXActivity.java
index 30f54ba34c8..c8c832770c5 100644
--- a/camera/integration-tests/coretestapp/src/main/java/androidx/camera/integration/core/CameraXActivity.java
+++ b/camera/integration-tests/coretestapp/src/main/java/androidx/camera/integration/core/CameraXActivity.java
@@ -119,7 +119,7 @@ public class CameraXActivity extends AppCompatActivity
     private VideoCapture mVideoCapture;
     private Camera mCamera;
     @ImageCapture.CaptureMode
-    private int mCaptureMode = ImageCapture.CaptureMode.MIN_LATENCY;
+    private int mCaptureMode = ImageCapture.CaptureMode.MINIMIZE_LATENCY;
     // Synthetic Accessor
     @SuppressWarnings("WeakerAccess")
     TextureView mTextureView;
@@ -498,13 +498,13 @@ public class CameraXActivity extends AppCompatActivity
         Button btnCaptureQuality = this.findViewById(R.id.capture_quality);
         btnCaptureQuality.setVisibility(View.VISIBLE);
         btnCaptureQuality.setText(
-                mCaptureMode == ImageCapture.CaptureMode.MAX_QUALITY ? "MAX" : "MIN");
+                mCaptureMode == ImageCapture.CaptureMode.MAXIMIZE_QUALITY ? "MAX" : "MIN");
         btnCaptureQuality.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                mCaptureMode = (mCaptureMode == ImageCapture.CaptureMode.MAX_QUALITY
-                        ? ImageCapture.CaptureMode.MIN_LATENCY
-                        : ImageCapture.CaptureMode.MAX_QUALITY);
+                mCaptureMode = (mCaptureMode == ImageCapture.CaptureMode.MAXIMIZE_QUALITY
+                        ? ImageCapture.CaptureMode.MINIMIZE_LATENCY
+                        : ImageCapture.CaptureMode.MAXIMIZE_QUALITY);
                 rebindUseCases();
             }
         });
diff --git a/camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt b/camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt
index 424b3567efb..a731474296a 100644
--- a/camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt
+++ b/camera/integration-tests/timingtestapp/src/main/java/androidx/camera/integration/antelope/cameracontrollers/CameraXController.kt
@@ -326,7 +326,7 @@ private fun cameraXImageCaptureUseCaseBuilder(
 ): ImageCapture.Builder {
 
     val configBuilder = ImageCapture.Builder()
-        .setCaptureMode(ImageCapture.CaptureMode.MAX_QUALITY)
+        .setCaptureMode(ImageCapture.CaptureMode.MAXIMIZE_QUALITY)
     Camera2Config.Extender(configBuilder)
         .setDeviceStateCallback(deviceStateCallback)
         .setSessionCaptureCallback(sessionCaptureCallback)