pull/497/head
Mattia Iavarone 6 years ago
parent c2af333aea
commit bd83dead4e
  1. 7
      cameraview/src/androidTest/java/com/otaliastudios/cameraview/preview/MockCameraPreview.java
  2. 8
      cameraview/src/main/java/com/otaliastudios/cameraview/preview/CameraPreview.java

@ -15,6 +15,8 @@ public class MockCameraPreview extends CameraPreview<View, Void> {
super(context, parent); super(context, parent);
} }
private View rootView;
@Override @Override
public boolean supportsCropping() { public boolean supportsCropping() {
return true; return true;
@ -23,7 +25,8 @@ public class MockCameraPreview extends CameraPreview<View, Void> {
@NonNull @NonNull
@Override @Override
protected View onCreateView(@NonNull Context context, @NonNull ViewGroup parent) { protected View onCreateView(@NonNull Context context, @NonNull ViewGroup parent) {
return new View(context); rootView = new View(context);
return rootView;
} }
@NonNull @NonNull
@ -42,6 +45,6 @@ public class MockCameraPreview extends CameraPreview<View, Void> {
@NonNull @NonNull
@Override @Override
public View getRootView() { public View getRootView() {
return null; return rootView;
} }
} }

@ -7,6 +7,7 @@ import androidx.annotation.VisibleForTesting;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.ViewParent;
import com.otaliastudios.cameraview.CameraLogger; import com.otaliastudios.cameraview.CameraLogger;
import com.otaliastudios.cameraview.engine.CameraEngine; import com.otaliastudios.cameraview.engine.CameraEngine;
@ -240,8 +241,11 @@ public abstract class CameraPreview<T extends View, Output> {
* this is a lifecycle event. * this is a lifecycle event.
*/ */
public void onDestroy() { public void onDestroy() {
ViewGroup parent = (ViewGroup) getRootView().getParent(); View root = getRootView();
parent.removeView(getRootView()); ViewParent parent = root.getParent();
if (parent instanceof ViewGroup) {
((ViewGroup) parent).removeView(root);
}
} }
/** /**

Loading…
Cancel
Save