From 64bb4c1b9fb2b303486b227a350ee35541e0e502 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Wed, 15 Nov 2017 17:23:23 +0100 Subject: [PATCH] Remove unwanted API --- .../cameraview/CameraOptions1Test.java | 10 ++++----- .../cameraview/CameraOptions.java | 22 ------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java index cc480982..402a47da 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java @@ -14,8 +14,11 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.mockito.Mockito.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; @RunWith(AndroidJUnit4.class) @SmallTest @@ -60,7 +63,6 @@ public class CameraOptions1Test extends BaseTest { for (Camera.Size size : sizes) { Size internalSize = new Size(size.width, size.height); assertTrue(supportedSizes.contains(internalSize)); - assertTrue(o.supports(internalSize)); } } @@ -80,7 +82,6 @@ public class CameraOptions1Test extends BaseTest { for (Camera.Size size : sizes) { Size internalSize = new Size(size.width, size.height).flip(); assertTrue(supportedSizes.contains(internalSize)); - assertTrue(o.supports(internalSize)); } } @@ -105,7 +106,6 @@ public class CameraOptions1Test extends BaseTest { assertEquals(supportedRatios.size(), expected.size()); for (AspectRatio ratio : expected) { assertTrue(supportedRatios.contains(ratio)); - assertTrue(o.supports(ratio)); } } diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java index f0f43c55..6ef68ed0 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java @@ -99,28 +99,6 @@ public class CameraOptions { CameraOptions(CameraCharacteristics params) {} - /** - * Shorthand for getSupportedPictureSizes().contains(value). - * - * @param size value - * @return whether it's supported - */ - public boolean supports(Size size) { - return getSupportedPictureSizes().contains(size); - } - - - /** - * Shorthand for getSupportedPictureAspectRatios().contains(value). - * - * @param ratio value - * @return whether it's supported - */ - public boolean supports(AspectRatio ratio) { - return getSupportedPictureAspectRatios().contains(ratio); - } - - /** * Shorthand for getSupportedFacing().contains(value). *