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;
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;
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
});
}
- 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) {
if (mFocusManager != null) {
mFocusManager.onPreviewStopped();
}
- stopSmartCamera();
SessionStatsCollector.instance().previewActive(false);
}
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;
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;
@Override
public void onPreviewInitialDataReceived() {
- SmartCameraHelper.register(mCameraDevice, mParameters.getPreviewSize(), mActivity,
- (ViewGroup) mActivity.findViewById(R.id.camera_app_root));
}
@Override
mFocusManager.onPreviewStopped();
}
mPreviewing = false;
- SmartCameraHelper.tearDown();
}
private void closeCamera() {
+++ /dev/null
-/*
- * 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() {
- }
-}