commit 3ba647bff45d0dabb23067486005952d32097d4c
author Chih-Chung Chang <chihchung@google.com> Fri Oct 07 03:20:41 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 07 03:20:41 2011 -0700
tree 11b88c58654aeebd0ae7173de61d67b6c7941819
parent e33371f49766f8bea258426b2a6023e86efb33a4
parent 8608b577921acf67a5a7b7968cb3633b8f94714d

Merge "Allow user to adjust the focus and shutter sound volume."

src/com/android/camera/ActivityBase.java

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 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 @@
     private Intent mResultDataForTesting;
 
     @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
+    }
+
+    @Override
     public boolean onSearchRequested() {
         return false;
     }

src/com/android/camera/SoundPlayer.java

diff --git a/src/com/android/camera/SoundPlayer.java b/src/com/android/camera/SoundPlayer.java
index 1c2d16b..fed3926 100644
--- a/src/com/android/camera/SoundPlayer.java
+++ b/src/com/android/camera/SoundPlayer.java
@@ -41,7 +41,7 @@
             try {
                 if (mPlayer == null) {
                     MediaPlayer player = new MediaPlayer();
-                    player.setAudioStreamType(AudioManager.STREAM_SYSTEM);
+                    player.setAudioStreamType(AudioManager.STREAM_MUSIC);
                     player.setDataSource(mAfd.getFileDescriptor(), mAfd.getStartOffset(),
                             mAfd.getLength());
                     player.setLooping(false);