commit dc0369f37b07adb4355113540af3c1f7c82a404e
author Sascha Haeberling <haeberling@google.com> Thu Sep 04 23:20:19 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 23:20:20 2014 +0000
tree 8494f3b73e55e53fbf250199d622bdbba765cc0f
parent eacf94608e5358a028c64dd1523270e61093e8b2
parent 961805e8fafa3ef21d1984eeb1429b40df6ffcde

Merge "Load Gcam OneCamera in CaptureModule when it's also doing normal shots." into ub-camera-glacier

src/com/android/camera/CaptureModule.java

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 10d837e..16a0d69 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -288,8 +288,6 @@
         mSettingsManager.addListener(this);
         mDebugDataDir = mContext.getExternalCacheDir();
         mStickyGcamCamera = stickyHdr;
-        // TODO: Read HDR setting from user preferences.
-        mHdrEnabled = stickyHdr;
     }
 
     @Override
@@ -557,6 +555,8 @@
             mSensorManager.registerListener(this, mMagneticSensor,
                     SensorManager.SENSOR_DELAY_NORMAL);
         }
+        mHdrEnabled = mStickyGcamCamera || mAppController.getSettingsManager().getInteger(
+                SettingsManager.SCOPE_GLOBAL, Keys.KEY_CAMERA_HDR_PLUS) == 1;
 
         // This means we are resuming with an existing preview texture. This
         // means we will never get the onSurfaceTextureAvailable call. So we
@@ -1249,11 +1249,8 @@
         if (mPaused) {
             return;
         }
-        // TODO: Un-comment once we have timer back.
-        // cancelCountDown();
-
+        cancelCountDown();
         mAppController.freezeScreenUntilPreviewReady();
-
         initSurface(mPreviewTexture);
 
         // TODO: Un-comment once we have focus back.