diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-21 08:51:26 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-21 08:51:26 -0800 |
commit | be86a06bfd8ccc0b3a6f597903ba1181a9b8f875 (patch) | |
tree | b5118c05f72f728619d315ad45b023fef2313e88 /src/com/android/camera | |
parent | 2380acddaddcd5eb0b0042b0a442dd4e732f46da (diff) | |
parent | 8a50cda8f72738e943904fdf7cae189b2b0a8ea8 (diff) | |
download | android_packages_apps_Snap-be86a06bfd8ccc0b3a6f597903ba1181a9b8f875.tar.gz android_packages_apps_Snap-be86a06bfd8ccc0b3a6f597903ba1181a9b8f875.tar.bz2 android_packages_apps_Snap-be86a06bfd8ccc0b3a6f597903ba1181a9b8f875.zip |
Merge "camera: override shutter sound volume"
Diffstat (limited to 'src/com/android/camera')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 9ba48bde8..e9786431b 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -49,6 +49,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.Looper; import android.os.Message; +import android.os.SystemProperties; import android.preference.PreferenceManager; import android.provider.MediaStore; import android.provider.Settings; @@ -101,6 +102,8 @@ import java.io.File; import static com.android.camera.CameraManager.CameraOpenErrorCallback; +import android.media.AudioManager; + public class CameraActivity extends Activity implements ModuleSwitcher.ModuleSwitchListener, ActionBar.OnMenuVisibilityListener, @@ -212,6 +215,10 @@ public class CameraActivity extends Activity public static int SETTING_LIST_WIDTH_2 = 250; private Bitmap mPreviewThumbnailBitmap; + private AudioManager mAudioManager; + private int mShutterVol; + private int mOriginalMasterVol; + private class MyOrientationEventListener extends OrientationEventListener { public MyOrientationEventListener(Context context) { @@ -1167,6 +1174,12 @@ public class CameraActivity extends Activity super.onCreate(state); GcamHelper.init(getContentResolver()); + mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); + mOriginalMasterVol = mAudioManager.getMasterVolume(); + mShutterVol = SystemProperties.getInt("persist.camera.snapshot.volume", -1); + if (mShutterVol >= 0 && mShutterVol <= 100 ) + mAudioManager.setMasterVolume(mShutterVol,0); + getWindow().requestFeature(Window.FEATURE_ACTION_BAR); setContentView(R.layout.camera_filmstrip); @@ -1377,6 +1390,8 @@ public class CameraActivity extends Activity @Override public void onPause() { + if (mShutterVol >= 0 && mShutterVol <= 100) + mAudioManager.setMasterVolume(mOriginalMasterVol,0); // Delete photos that are pending deletion performDeletion(); mOrientationListener.disable(); @@ -1400,6 +1415,8 @@ public class CameraActivity extends Activity @Override public void onResume() { + if (mShutterVol >= 0 && mShutterVol <= 100) + mAudioManager.setMasterVolume(mShutterVol,0); // TODO: Handle this in OrientationManager. // Auto-rotate off if (Settings.System.getInt(getContentResolver(), @@ -1467,6 +1484,8 @@ public class CameraActivity extends Activity @Override public void onDestroy() { + if (mShutterVol >= 0 && mShutterVol <= 100) + mAudioManager.setMasterVolume(mOriginalMasterVol,0); if (mSecureCamera) { unregisterReceiver(mScreenOffReceiver); } |