Fix SurfaceView

pull/22/head
Mattia Iavarone 8 years ago
parent c3b2527e88
commit e01eb46bfc
  1. 10
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/PreviewTest.java
  2. 4
      cameraview/src/main/res/layout/surface_view.xml

@ -26,22 +26,24 @@ public abstract class PreviewTest {
private Preview preview;
private ViewGroup parent;
private Preview.SurfaceCallback callback;
private final Semaphore lock = new Semaphore(1, true);
private Semaphore lock;
@Rule
public ActivityTestRule<TestActivity> rule = new ActivityTestRule<>(TestActivity.class);
@Before
public void setUp() {
InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
Context context = rule.getActivity();
parent = new FrameLayout(context);
preview = createPreview(context, parent);
callback = mock(Preview.SurfaceCallback.class);
preview.setSurfaceCallback(callback);
InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
@Override
public void run() {
rule.getActivity().setContentView(parent);
lock = new Semaphore(1, true);
}
});
}

@ -3,8 +3,8 @@
<SurfaceView
android:id="@+id/surface_view"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:gravity="center" />
</merge>

Loading…
Cancel
Save