diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2016-04-28 22:46:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-28 22:46:02 +0000 |
| commit | 5b5c25accdd7483cc35f492c37e62b9e375071f1 (patch) | |
| tree | ba24fe1845559ba629832dc38787ed98f5b3a415 /src/com/android/devcamera/DevCameraActivity.java | |
| parent | 6bd1323f0ad276bc9cd0324e517e7220a46e6d4d (diff) | |
| parent | 7644c106ed9c11605a76261de573bfa14d039052 (diff) | |
| download | DevCamera-5b5c25accdd7483cc35f492c37e62b9e375071f1.tar.gz | |
Merge "Fix portrait-orientation assumptions am: 3855bb499f am: dbe726e318" into nyc-mr1-dev-plus-aosp
am: 7644c106ed
* commit '7644c106ed9c11605a76261de573bfa14d039052':
Fix portrait-orientation assumptions
Change-Id: I238d669cd158c60ce5e504b29cb69b1b0b45bdfb
Diffstat (limited to 'src/com/android/devcamera/DevCameraActivity.java')
| -rw-r--r-- | src/com/android/devcamera/DevCameraActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/devcamera/DevCameraActivity.java b/src/com/android/devcamera/DevCameraActivity.java index 6194915..869e065 100644 --- a/src/com/android/devcamera/DevCameraActivity.java +++ b/src/com/android/devcamera/DevCameraActivity.java @@ -542,8 +542,9 @@ public class DevCameraActivity extends Activity implements CameraInterface.MyCam float[] fovs = mCamera.getFieldOfView(); mPreviewOverlay.setFieldOfView(fovs[0], fovs[1]); - mPreviewOverlay.setFacing(mToggleFrontCam.isChecked() ? - CameraCharacteristics.LENS_FACING_FRONT : CameraCharacteristics.LENS_FACING_BACK); + mPreviewOverlay.setFacingAndOrientation(mToggleFrontCam.isChecked() ? + CameraCharacteristics.LENS_FACING_FRONT : CameraCharacteristics.LENS_FACING_BACK, + mCamera.getOrientation()); if (mGyroOperations == null) { SensorManager sensorManager = (SensorManager) getSystemService(this.SENSOR_SERVICE); mGyroOperations = new GyroOperations(sensorManager); |