summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/PhotoModule.java
diff options
context:
space:
mode:
authorJack Yoo <jyoo@codeaurora.org>2016-02-22 17:40:11 -0800
committerJack Yoo <jyoo@codeaurora.org>2016-04-06 09:50:12 -0700
commitcef16d76d423dbdb426046ad5a339c32b9ac6f75 (patch)
tree6bf09e496b9a59a5d83127b32ef1b7fe7938e17d /src/com/android/camera/PhotoModule.java
parent3618eb79912c36216b197580e54e366ab19d2a61 (diff)
downloadandroid_packages_apps_Snap-cef16d76d423dbdb426046ad5a339c32b9ac6f75.tar.gz
android_packages_apps_Snap-cef16d76d423dbdb426046ad5a339c32b9ac6f75.tar.bz2
android_packages_apps_Snap-cef16d76d423dbdb426046ad5a339c32b9ac6f75.zip
SnapdragonCamera: Adjusting view initialization
Instead of removing and adding the entire root view, changing only core surface view on module change. Change-Id: I5c39cf23b2a58280f4e4e8484865bbed0b12e1cf CRs-Fixed: 979254
Diffstat (limited to 'src/com/android/camera/PhotoModule.java')
-rw-r--r--src/com/android/camera/PhotoModule.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 589f55152..f8ad51190 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();
@@ -2425,6 +2427,8 @@ public class PhotoModule
mOpenCameraThread.start();
}
+ mUI.applySurfaceChange(PhotoUI.SURFACE_STATUS.SURFACE_VIEW);
+
mJpegPictureCallbackTime = 0;
mZoomValue = 0;
@@ -2463,6 +2467,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);