DO NOT MERGE - Remove SmartCamera (Part 1/2)

  Bug: 14254411

Change-Id: I09488e8c39fce104a92659a989a275a5f72821bb

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 517d75d..adfb664 100644 (file)
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -45,20 +45,19 @@ import android.provider.MediaStore;
 import android.view.KeyEvent;
 import android.view.OrientationEventListener;
 import android.view.View;
-import android.view.ViewGroup;
 
 import com.android.camera.PhotoModule.NamedImages.NamedEntity;
 import com.android.camera.app.AppController;
 import com.android.camera.app.CameraAppUI;
+import com.android.camera.app.LocationManager;
+import com.android.camera.app.MediaSaver;
+import com.android.camera.app.MemoryManager;
+import com.android.camera.app.MemoryManager.MemoryListener;
 import com.android.camera.cameradevice.CameraManager.CameraAFCallback;
 import com.android.camera.cameradevice.CameraManager.CameraAFMoveCallback;
 import com.android.camera.cameradevice.CameraManager.CameraPictureCallback;
 import com.android.camera.cameradevice.CameraManager.CameraProxy;
 import com.android.camera.cameradevice.CameraManager.CameraShutterCallback;
-import com.android.camera.app.LocationManager;
-import com.android.camera.app.MediaSaver;
-import com.android.camera.app.MemoryManager;
-import com.android.camera.app.MemoryManager.MemoryListener;
 import com.android.camera.debug.Log;
 import com.android.camera.exif.ExifInterface;
 import com.android.camera.exif.ExifTag;
@@ -73,7 +72,6 @@ import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
 import com.android.camera.util.SessionStatsCollector;
-import com.android.camera.util.SmartCameraHelper;
 import com.android.camera.util.UsageStatistics;
 import com.android.camera2.R;
 import com.google.common.logging.eventprotos;
@@ -379,11 +377,6 @@ public class PhotoModule
         setCameraState(IDLE);
         startFaceDetection();
         locationFirstRun();
-        // TODO(teresako): Check with Camera team re: starting the Smart Camera here rather than
-        // in the onPreviewInitialDataReceived() function which is no longer being called in
-        // Denali. The original issue of the blue overlay not going away no longer seems to be
-        // an issue.  Related CL: https://googleplex-android-review.git.corp.google.com/#/c/428719/.
-        startSmartCamera();
     }
 
     // Prompt the user to pick to record location for the very first run of
@@ -640,15 +633,6 @@ public class PhotoModule
         });
     }
 
-    private void startSmartCamera() {
-        SmartCameraHelper.register(mCameraDevice, mParameters.getPreviewSize(), mActivity,
-                (ViewGroup) mActivity.findViewById(R.id.camera_app_root));
-    }
-
-    private void stopSmartCamera() {
-        SmartCameraHelper.tearDown();
-    }
-
     @Override
     public void startFaceDetection() {
         if (mFaceDetectionStarted) {
@@ -1564,7 +1548,6 @@ public class PhotoModule
         if (mFocusManager != null) {
             mFocusManager.onPreviewStopped();
         }
-        stopSmartCamera();
         SessionStatsCollector.instance().previewActive(false);
     }
 

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 35b7400..2ac89d0 100644 (file)
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -49,18 +49,17 @@ 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;
 import com.android.camera.app.CameraAppUI;
-import com.android.camera.cameradevice.CameraManager;
-import com.android.camera.cameradevice.CameraManager.CameraPictureCallback;
-import com.android.camera.cameradevice.CameraManager.CameraProxy;
 import com.android.camera.app.LocationManager;
 import com.android.camera.app.MediaSaver;
 import com.android.camera.app.MemoryManager;
 import com.android.camera.app.MemoryManager.MemoryListener;
+import com.android.camera.cameradevice.CameraManager;
+import com.android.camera.cameradevice.CameraManager.CameraPictureCallback;
+import com.android.camera.cameradevice.CameraManager.CameraProxy;
 import com.android.camera.debug.Log;
 import com.android.camera.exif.ExifInterface;
 import com.android.camera.hardware.HardwareSpec;
@@ -70,7 +69,6 @@ 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;
@@ -900,8 +898,6 @@ public class VideoModule extends CameraModule
 
     @Override
     public void onPreviewInitialDataReceived() {
-        SmartCameraHelper.register(mCameraDevice, mParameters.getPreviewSize(), mActivity,
-                (ViewGroup) mActivity.findViewById(R.id.camera_app_root));
     }
 
     @Override
@@ -914,7 +910,6 @@ public class VideoModule extends CameraModule
             mFocusManager.onPreviewStopped();
         }
         mPreviewing = false;
-        SmartCameraHelper.tearDown();
     }
 
     private void closeCamera() {

diff --git a/src_pd/com/android/camera/util/SmartCameraHelper.java b/src_pd/com/android/camera/util/SmartCameraHelper.java
deleted file mode 100644 (file)
index 6f55a61..0000000
--- a/src_pd/com/android/camera/util/SmartCameraHelper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.camera.util;
-
-import android.app.Activity;
-import android.hardware.Camera;
-import android.view.ViewGroup;
-
-import com.android.camera.cameradevice.CameraManager.CameraProxy;
-
-public class SmartCameraHelper {
-    public static void register(CameraProxy camera, Camera.Size previewSize, Activity activity,
-            ViewGroup parentView) {
-    }
-
-    public static void tearDown() {
-    }
-}