diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-04-17 21:56:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-04-17 21:56:47 -0700 |
| commit | a136064e151b0aade3e06356b3b32991a1ea7201 (patch) | |
| tree | 6e8d3c3d40a6ceee97c05ce7804528d5d132b290 /src/com/android/camera/PhotoModule.java | |
| parent | b725102767aedd58057392053a8d7930626b329b (diff) | |
| parent | cef16d76d423dbdb426046ad5a339c32b9ac6f75 (diff) | |
| download | android_packages_apps_Snap-a136064e151b0aade3e06356b3b32991a1ea7201.tar.gz android_packages_apps_Snap-a136064e151b0aade3e06356b3b32991a1ea7201.tar.bz2 android_packages_apps_Snap-a136064e151b0aade3e06356b3b32991a1ea7201.zip | |
Merge "SnapdragonCamera: Adjusting view initialization" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index f3d9a4ca1..3abd74cca 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -696,6 +696,7 @@ public class PhotoModule private void switchCamera() { if (mPaused) return; + mUI.applySurfaceChange(PhotoUI.SURFACE_STATUS.HIDE); Log.v(TAG, "Start to switch camera. id=" + mPendingSwitchCameraId); mCameraId = mPendingSwitchCameraId; mPendingSwitchCameraId = -1; @@ -735,6 +736,7 @@ public class PhotoModule mFocusManager.setParameters(mInitialParams); setupPreview(); + mUI.applySurfaceChange(PhotoUI.SURFACE_STATUS.SURFACE_VIEW); // reset zoom value index mZoomValue = 0; resizeForPreviewAspectRatio(); @@ -2426,6 +2428,8 @@ public class PhotoModule mOpenCameraThread.start(); } + mUI.applySurfaceChange(PhotoUI.SURFACE_STATUS.SURFACE_VIEW); + mJpegPictureCallbackTime = 0; mZoomValue = 0; @@ -2464,6 +2468,8 @@ public class PhotoModule @Override public void onPauseBeforeSuper() { mPaused = true; + mUI.applySurfaceChange(PhotoUI.SURFACE_STATUS.HIDE); + Sensor gsensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER); if (gsensor != null) { mSensorManager.unregisterListener(this, gsensor); |