Changed OrientationHelper

pull/23/head
Andrew Miroshnychenko 8 years ago
parent 6f0a022866
commit 6f6b928f73
  1. 11
      cameraview/src/main/java/com/otaliastudios/cameraview/CameraView.java
  2. 7
      cameraview/src/main/utils/com/otaliastudios/cameraview/OrientationHelper.java

@ -170,8 +170,7 @@ public class CameraView extends FrameLayout {
protected void onAttachedToWindow() { protected void onAttachedToWindow() {
super.onAttachedToWindow(); super.onAttachedToWindow();
if (!isInEditMode()) { if (!isInEditMode()) {
WindowManager manager = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE); mOrientationHelper.enable(getContext());
mOrientationHelper.enable(manager.getDefaultDisplay());
} }
} }
@ -488,14 +487,8 @@ public class CameraView extends FrameLayout {
if (checkPermissions(getSessionType())) { if (checkPermissions(getSessionType())) {
mIsStarted = true; mIsStarted = true;
// Update display orientation for current CameraController // Update display orientation for current CameraController
WindowManager manager = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE); mOrientationHelper.enable(getContext());
Display display = manager.getDefaultDisplay();
if (display != null) {
mOrientationHelper.enable(display);
}
mCameraController.start(); mCameraController.start();
} }
} }

@ -7,6 +7,7 @@ import android.util.SparseIntArray;
import android.view.Display; import android.view.Display;
import android.view.OrientationEventListener; import android.view.OrientationEventListener;
import android.view.Surface; import android.view.Surface;
import android.view.WindowManager;
class OrientationHelper { class OrientationHelper {
@ -67,10 +68,10 @@ class OrientationHelper {
}; };
} }
void enable(Display display) { void enable(Context context) {
mDisplay = display; mDisplay = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
mListener.enable(); mListener.enable();
mLastKnownDisplayOffset = DISPLAY_ORIENTATIONS.get(display.getRotation()); mLastKnownDisplayOffset = DISPLAY_ORIENTATIONS.get(mDisplay.getRotation());
mCallbacks.onDisplayOffsetChanged(mLastKnownDisplayOffset); mCallbacks.onDisplayOffsetChanged(mLastKnownDisplayOffset);
} }

Loading…
Cancel
Save