am 94dea6e4: Merge "Refactor UsageStatistic so it can be disabled more easily." into...

[android-x86/packages-apps-Camera2.git] / src / com / android / camera / VideoModule.java

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 5003c96..8038854 100644 (file)
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -49,6 +49,7 @@ import android.provider.MediaStore.Video;
 import android.view.KeyEvent;
 import android.view.OrientationEventListener;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Toast;
 
 import com.android.camera.app.AppController;
@@ -69,6 +70,7 @@ import com.android.camera.settings.SettingsManager;
 import com.android.camera.settings.SettingsUtil;
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
+import com.android.camera.util.SmartCameraHelper;
 import com.android.camera.util.UsageStatistics;
 import com.android.camera2.R;
 import com.google.common.logging.eventprotos;
@@ -893,6 +895,12 @@ public class VideoModule extends CameraModule
     }
 
     @Override
+    public void onPreviewInitialDataReceived() {
+        SmartCameraHelper.register(mCameraDevice, mParameters.getPreviewSize(), mActivity,
+                (ViewGroup) mActivity.findViewById(R.id.camera_app_root));
+    }
+
+    @Override
     public void stopPreview() {
         if (!mPreviewing) {
             return;
@@ -902,6 +910,7 @@ public class VideoModule extends CameraModule
             mFocusManager.onPreviewStopped();
         }
         mPreviewing = false;
+        SmartCameraHelper.tearDown();
     }
 
     private void closeCamera() {