summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/ActivityBase.java
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-10-07 13:40:01 +0800
committerChih-Chung Chang <chihchung@google.com>2011-10-07 13:50:52 +0800
commit8608b577921acf67a5a7b7968cb3633b8f94714d (patch)
treedfa5ffccf8a93a3591110f36fdb68f631e79414b /src/com/android/camera/ActivityBase.java
parentfc52f4a9bf815633739125883807bfe965cf6009 (diff)
downloadLegacyCamera-8608b577921acf67a5a7b7968cb3633b8f94714d.zip
LegacyCamera-8608b577921acf67a5a7b7968cb3633b8f94714d.tar.gz
LegacyCamera-8608b577921acf67a5a7b7968cb3633b8f94714d.tar.bz2
Allow user to adjust the focus and shutter sound volume.
This also fix the problem that user need to slience the ringer to silence the focus/shutter sound. Change-Id: Ia4ae5feb4926172fd8af7dc4023525f2ab7daa0e
Diffstat (limited to 'src/com/android/camera/ActivityBase.java')
-rw-r--r--src/com/android/camera/ActivityBase.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/camera/ActivityBase.java b/src/com/android/camera/ActivityBase.java
index 96d7331..ec878ee 100644
--- a/src/com/android/camera/ActivityBase.java
+++ b/src/com/android/camera/ActivityBase.java
@@ -21,6 +21,8 @@ import com.android.camera.ui.PopupManager;
import android.app.Activity;
import android.view.KeyEvent;
import android.content.Intent;
+import android.media.AudioManager;
+import android.os.Bundle;
/**
* Superclass of Camera and VideoCamera activities.
@@ -30,6 +32,12 @@ public class ActivityBase extends Activity {
private Intent mResultDataForTesting;
@Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ setVolumeControlStream(AudioManager.STREAM_MUSIC);
+ }
+
+ @Override
public boolean onSearchRequested() {
return false;
}