Merge pull request #81 from ANPez/master

Fix Android Studio preview error using isInEditMode
pull/1/head
Dylan McIntyre 8 years ago committed by GitHub
commit 0affe235d9
  1. 6
      camerakit/src/main/java/com/flurgle/camerakit/CameraView.java

@ -151,6 +151,7 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
setPermissions(mPermissions); setPermissions(mPermissions);
setVideoQuality(mVideoQuality); setVideoQuality(mVideoQuality);
if (!isInEditMode()) {
mDisplayOrientationDetector = new DisplayOrientationDetector(context) { mDisplayOrientationDetector = new DisplayOrientationDetector(context) {
@Override @Override
public void onDisplayOrientationChanged(int displayOrientation) { public void onDisplayOrientationChanged(int displayOrientation) {
@ -173,22 +174,27 @@ public class CameraView extends FrameLayout implements LifecycleObserver {
return true; return true;
} }
}); });
}
mLifecycle = null; mLifecycle = null;
} }
@Override @Override
protected void onAttachedToWindow() { protected void onAttachedToWindow() {
super.onAttachedToWindow(); super.onAttachedToWindow();
if (!isInEditMode()) {
mDisplayOrientationDetector.enable( mDisplayOrientationDetector.enable(
ViewCompat.isAttachedToWindow(this) ViewCompat.isAttachedToWindow(this)
? DisplayManagerCompat.getInstance(getContext()).getDisplay(Display.DEFAULT_DISPLAY) ? DisplayManagerCompat.getInstance(getContext()).getDisplay(Display.DEFAULT_DISPLAY)
: null : null
); );
} }
}
@Override @Override
protected void onDetachedFromWindow() { protected void onDetachedFromWindow() {
if (!isInEditMode()) {
mDisplayOrientationDetector.disable(); mDisplayOrientationDetector.disable();
}
super.onDetachedFromWindow(); super.onDetachedFromWindow();
} }

Loading…
Cancel
Save