Remove unwanted API

pull/101/head
Mattia Iavarone 8 years ago
parent 4c38c3a58b
commit 64bb4c1b9f
  1. 10
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/CameraOptions1Test.java
  2. 22
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraOptions.java

@ -14,8 +14,11 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import static org.mockito.Mockito.*; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.*; 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) @RunWith(AndroidJUnit4.class)
@SmallTest @SmallTest
@ -60,7 +63,6 @@ public class CameraOptions1Test extends BaseTest {
for (Camera.Size size : sizes) { for (Camera.Size size : sizes) {
Size internalSize = new Size(size.width, size.height); Size internalSize = new Size(size.width, size.height);
assertTrue(supportedSizes.contains(internalSize)); assertTrue(supportedSizes.contains(internalSize));
assertTrue(o.supports(internalSize));
} }
} }
@ -80,7 +82,6 @@ public class CameraOptions1Test extends BaseTest {
for (Camera.Size size : sizes) { for (Camera.Size size : sizes) {
Size internalSize = new Size(size.width, size.height).flip(); Size internalSize = new Size(size.width, size.height).flip();
assertTrue(supportedSizes.contains(internalSize)); assertTrue(supportedSizes.contains(internalSize));
assertTrue(o.supports(internalSize));
} }
} }
@ -105,7 +106,6 @@ public class CameraOptions1Test extends BaseTest {
assertEquals(supportedRatios.size(), expected.size()); assertEquals(supportedRatios.size(), expected.size());
for (AspectRatio ratio : expected) { for (AspectRatio ratio : expected) {
assertTrue(supportedRatios.contains(ratio)); assertTrue(supportedRatios.contains(ratio));
assertTrue(o.supports(ratio));
} }
} }

@ -99,28 +99,6 @@ public class CameraOptions {
CameraOptions(CameraCharacteristics params) {} 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). * Shorthand for getSupportedFacing().contains(value).
* *

Loading…
Cancel
Save