summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/panorama/PanoramaActivity.java
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-06-04 18:21:06 -0700
committerEino-Ville Talvala <etalvala@google.com>2012-06-04 18:21:06 -0700
commit1461b5333aab31faee65272d64c2ac7f9809d4d0 (patch)
tree227938920c11a81961e1fa911d48ba5b426c9454 /src/com/android/camera/panorama/PanoramaActivity.java
parentefa3f22e42b31bfcf916610e01efe0bdc4940080 (diff)
downloadpackages_apps_LegacyCamera-1461b5333aab31faee65272d64c2ac7f9809d4d0.zip
packages_apps_LegacyCamera-1461b5333aab31faee65272d64c2ac7f9809d4d0.tar.gz
packages_apps_LegacyCamera-1461b5333aab31faee65272d64c2ac7f9809d4d0.tar.bz2
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
Diffstat (limited to 'src/com/android/camera/panorama/PanoramaActivity.java')
-rwxr-xr-xsrc/com/android/camera/panorama/PanoramaActivity.java10
1 files changed, 5 insertions, 5 deletions
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.SurfaceTexture;
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 @@ public class PanoramaActivity extends ActivityBase implements
private RotateDialogController mRotateDialog;
- private CameraSound mCameraSound;
+ private MediaActionSound mCameraSound;
private class MosaicJpeg {
public MosaicJpeg(byte[] data, int width, int height) {
@@ -293,7 +293,7 @@ public class PanoramaActivity extends ActivityBase implements
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 @@ public class PanoramaActivity extends ActivityBase implements
// 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);
}
}