Remove SmartCam from Denali. DO NOT MERGE

Change-Id: I94813a13301eb3bcd89eeb96a757763b3e7b34ff

diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index a1c3ebe..d90a0ce 100644 (file)
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -45,8 +45,6 @@ import android.util.Log;
 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;
@@ -71,7 +69,6 @@ import com.android.camera.ui.RotateTextToast;
 import com.android.camera.util.ApiHelper;
 import com.android.camera.util.CameraUtil;
 import com.android.camera.util.GcamHelper;
-import com.android.camera.util.SmartCameraHelper;
 import com.android.camera.util.UsageStatistics;
 import com.android.camera2.R;
 import com.google.common.logging.eventprotos;
@@ -377,7 +374,6 @@ public class PhotoModule
 
     @Override
     public void onPreviewInitialDataReceived() {
-        startSmartCamera();
     }
 
     // Prompt the user to pick to record location for the very first run of
@@ -614,15 +610,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) {
@@ -1533,7 +1520,6 @@ public class PhotoModule
         if (mFocusManager != null) {
             mFocusManager.onPreviewStopped();
         }
-        stopSmartCamera();
     }
 
     @Override

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 43c0e83..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.app.CameraManager.CameraProxy;
-
-public class SmartCameraHelper {
-    public static void register(CameraProxy camera, Camera.Size previewSize, Activity activity,
-            ViewGroup parentView) {
-    }
-
-    public static void tearDown() {
-    }
-}