From e01eb46bfc78ec945bcf877dad703b108b4f2483 Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Wed, 6 Sep 2017 03:03:44 +0200 Subject: [PATCH] Fix SurfaceView --- .../com/otaliastudios/cameraview/PreviewTest.java | 14 ++++++++------ cameraview/src/main/res/layout/surface_view.xml | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/PreviewTest.java b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/PreviewTest.java index ea515d20..874eb3fb 100644 --- a/cameraview/src/androidTest/java/com/otaliastudios/cameraview/PreviewTest.java +++ b/cameraview/src/androidTest/java/com/otaliastudios/cameraview/PreviewTest.java @@ -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 rule = new ActivityTestRule<>(TestActivity.class); @Before public void setUp() { - 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() { + Context context = rule.getActivity(); + parent = new FrameLayout(context); + preview = createPreview(context, parent); + callback = mock(Preview.SurfaceCallback.class); + preview.setSurfaceCallback(callback); rule.getActivity().setContentView(parent); + + lock = new Semaphore(1, true); } }); } diff --git a/cameraview/src/main/res/layout/surface_view.xml b/cameraview/src/main/res/layout/surface_view.xml index 42fb3f23..3db4f4ea 100644 --- a/cameraview/src/main/res/layout/surface_view.xml +++ b/cameraview/src/main/res/layout/surface_view.xml @@ -3,8 +3,8 @@ + android:layout_height="match_parent" + android:gravity="center" />