Rename Camera to LegacyCamera for SDK inclusion.
The SDK needs a camera app that does not require GPU acceleration.
The Camera app from 4.0.4 meets these requirements.
Change-Id: Idb42d4b9e47d584ef1da10e3ba672d537c8db94b
diff --git a/Android.mk b/Android.mk
index 616047c..ec46e82 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,12 +5,12 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := Camera
+LOCAL_PACKAGE_NAME := LegacyCamera
#LOCAL_SDK_VERSION := current
-LOCAL_JNI_SHARED_LIBRARIES := libjni_mosaic
+LOCAL_JNI_SHARED_LIBRARIES := libjni_legacymosaic
-LOCAL_REQUIRED_MODULES := libjni_mosaic
+LOCAL_REQUIRED_MODULES := libjni_legacymosaic
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/jni/Android.mk b/jni/Android.mk
index 2043aa2..882e3a7 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -45,5 +45,5 @@
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := libjni_mosaic
+LOCAL_MODULE := libjni_legacymosaic
include $(BUILD_SHARED_LIBRARY)
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index a391e20..8c74d24 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -43,9 +43,9 @@
import android.hardware.Camera.Parameters;
import android.hardware.Camera.PictureCallback;
import android.hardware.Camera.Size;
-import android.hardware.CameraSound;
import android.location.Location;
import android.media.CameraProfile;
+import android.media.MediaActionSound;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -184,7 +184,7 @@
// generating thumbnails. This reduces the shot-to-shot time.
private ImageSaver mImageSaver;
- private CameraSound mCameraSound;
+ private MediaActionSound mCameraSound;
private Runnable mDoSnapRunnable = new Runnable() {
public void run() {
@@ -1066,7 +1066,7 @@
@Override
public void playSound(int soundId) {
- mCameraSound.playSound(soundId);
+ mCameraSound.play(soundId);
}
private boolean saveDataToFile(String filePath, byte[] data) {
@@ -1204,7 +1204,7 @@
// Do this after starting preview because it depends on camera
// parameters.
initializeIndicatorControl();
- mCameraSound = new CameraSound();
+ mCameraSound = new MediaActionSound();
// Make sure preview is started.
try {
diff --git a/src/com/android/camera/EffectsRecorder.java b/src/com/android/camera/EffectsRecorder.java
index b649bc2..678c0b7 100644
--- a/src/com/android/camera/EffectsRecorder.java
+++ b/src/com/android/camera/EffectsRecorder.java
@@ -32,7 +32,7 @@
import android.graphics.SurfaceTexture;
import android.hardware.Camera;
-import android.hardware.CameraSound;
+import android.media.MediaActionSound;
import android.media.MediaRecorder;
import android.media.CamcorderProfile;
import android.os.Handler;
@@ -118,7 +118,7 @@
private boolean mLogVerbose = Log.isLoggable(TAG, Log.VERBOSE);
private static final String TAG = "effectsrecorder";
- private CameraSound mCameraSound;
+ private MediaActionSound mCameraSound;
/** Determine if a given effect is supported at runtime
* Some effects require libraries not available on all devices
@@ -138,7 +138,7 @@
if (mLogVerbose) Log.v(TAG, "EffectsRecorder created (" + this + ")");
mContext = context;
mHandler = new Handler(Looper.getMainLooper());
- mCameraSound = new CameraSound();
+ mCameraSound = new MediaActionSound();
}
public void setCamera(Camera cameraDevice) {
@@ -693,7 +693,7 @@
recorder.setInputValue("maxFileSize", mMaxFileSize);
recorder.setInputValue("maxDurationMs", mMaxDurationMs);
recorder.setInputValue("recording", true);
- mCameraSound.playSound(CameraSound.START_VIDEO_RECORDING);
+ mCameraSound.play(MediaActionSound.START_VIDEO_RECORDING);
mState = STATE_RECORD;
}
@@ -713,7 +713,7 @@
}
Filter recorder = mRunner.getGraph().getFilter("recorder");
recorder.setInputValue("recording", false);
- mCameraSound.playSound(CameraSound.STOP_VIDEO_RECORDING);
+ mCameraSound.play(MediaActionSound.STOP_VIDEO_RECORDING);
mState = STATE_PREVIEW;
}
diff --git a/src/com/android/camera/FocusManager.java b/src/com/android/camera/FocusManager.java
index 72a0919..2b4ea6b 100644
--- a/src/com/android/camera/FocusManager.java
+++ b/src/com/android/camera/FocusManager.java
@@ -26,7 +26,7 @@
import android.graphics.RectF;
import android.hardware.Camera.Area;
import android.hardware.Camera.Parameters;
-import android.hardware.CameraSound;
+import android.media.MediaActionSound;
import android.os.Handler;
import android.os.Message;
import android.util.Log;
@@ -224,7 +224,7 @@
// so the state is always STATE_FOCUSING.
if (!Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.
equals(mFocusMode)) {
- mListener.playSound(CameraSound.FOCUS_COMPLETE);
+ mListener.playSound(MediaActionSound.FOCUS_COMPLETE);
}
} else {
mState = STATE_FAIL;
diff --git a/src/com/android/camera/panorama/PanoramaActivity.java b/src/com/android/camera/panorama/PanoramaActivity.java
index 46f9e34..3278bd6 100755
--- a/src/com/android/camera/panorama/PanoramaActivity.java
+++ b/src/com/android/camera/panorama/PanoramaActivity.java
@@ -50,10 +50,10 @@
import android.graphics.YuvImage;
import android.hardware.Camera.Parameters;
import android.hardware.Camera.Size;
-import android.hardware.CameraSound;
import android.hardware.Sensor;
import android.hardware.SensorManager;
import android.media.ExifInterface;
+import android.media.MediaActionSound;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -180,7 +180,7 @@
private RotateDialogController mRotateDialog;
- private CameraSound mCameraSound;
+ private MediaActionSound mCameraSound;
private class MosaicJpeg {
public MosaicJpeg(byte[] data, int width, int height) {
@@ -293,7 +293,7 @@
mDialogOkString = getResources().getString(R.string.dialog_ok);
mDialogPanoramaFailedString =
getResources().getString(R.string.pano_dialog_panorama_failed);
- mCameraSound = new CameraSound();
+ mCameraSound = new MediaActionSound();
mMainHandler = new Handler() {
@Override
@@ -763,11 +763,11 @@
// right now.
switch (mCaptureState) {
case CAPTURE_STATE_VIEWFINDER:
- mCameraSound.playSound(CameraSound.START_VIDEO_RECORDING);
+ mCameraSound.play(MediaActionSound.START_VIDEO_RECORDING);
startCapture();
break;
case CAPTURE_STATE_MOSAIC:
- mCameraSound.playSound(CameraSound.STOP_VIDEO_RECORDING);
+ mCameraSound.play(MediaActionSound.STOP_VIDEO_RECORDING);
stopCapture(false);
}
}
diff --git a/tests/Android.mk b/tests/Android.mk
index 40be647..eab9810 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -9,9 +9,9 @@
# Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := CameraTests
+LOCAL_PACKAGE_NAME := LegacyCameraTests
-LOCAL_INSTRUMENTATION_FOR := Camera
+LOCAL_INSTRUMENTATION_FOR := LegacyCamera
include $(BUILD_PACKAGE)
