diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-13 14:50:39 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-13 14:50:39 -0800 |
commit | 319aaa494e0a98e88311783d0f46bee2f85d52cf (patch) | |
tree | 56157e48e448aca813f2a548c9d7076230f7ec22 | |
parent | 10b0543c7483a85046efed8ba653630483cd6b2e (diff) | |
parent | e797d620ed00d38810af5c62d3776814f3a1f066 (diff) | |
download | android_packages_apps_Snap-319aaa494e0a98e88311783d0f46bee2f85d52cf.tar.gz android_packages_apps_Snap-319aaa494e0a98e88311783d0f46bee2f85d52cf.tar.bz2 android_packages_apps_Snap-319aaa494e0a98e88311783d0f46bee2f85d52cf.zip |
Merge "SnapdragonCamera: Fix no sound at 2s in "Countdown timer"" into camera-SnapdragonCamera.lnx.2.0
-rwxr-xr-x | src/com/android/camera/CaptureModule.java | 10 | ||||
-rwxr-xr-x | src/com/android/camera/CaptureUI.java | 11 | ||||
-rwxr-xr-x | src/com/android/camera/ui/CountDownView.java | 9 |
3 files changed, 29 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index fe599400f..e4bc67169 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3204,6 +3204,7 @@ public class CaptureModule implements CameraModule, PhotoController, } closeCamera(); resetAudioMute(); + mUI.releaseSoundPool(); mUI.showPreviewCover(); if (mUI.getGLCameraPreview() != null) { mUI.getGLCameraPreview().onPause(); @@ -3406,6 +3407,14 @@ public class CaptureModule implements CameraModule, PhotoController, } + private void loadSoundPoolResource() { + String timer = mSettingsManager.getValue(SettingsManager.KEY_TIMER); + int seconds = Integer.parseInt(timer); + if (seconds > 0) { + mUI.initCountDownView(); + } + } + @Override public void onResumeAfterSuper() { Log.d(TAG, "onResume " + getCameraMode()); @@ -3423,6 +3432,7 @@ public class CaptureModule implements CameraModule, PhotoController, setDisplayOrientation(); startBackgroundThread(); openProcessors(); + loadSoundPoolResource(); Message msg = Message.obtain(); msg.what = OPEN_CAMERA; if (isBackCamera()) { diff --git a/src/com/android/camera/CaptureUI.java b/src/com/android/camera/CaptureUI.java index c4952eb87..8b72d9259 100755 --- a/src/com/android/camera/CaptureUI.java +++ b/src/com/android/camera/CaptureUI.java @@ -1545,8 +1545,17 @@ public class CaptureUI implements FocusOverlayManager.FocusUI, showUIAfterCountDown(); } - public void startCountDown(int sec, boolean playSound) { + public void initCountDownView() { if (mCountDownView == null) initializeCountDown(); + } + + public void releaseSoundPool() { + if (mCountDownView != null) { + mCountDownView.releaseSoundPool(); + } + } + + public void startCountDown(int sec, boolean playSound) { mCountDownView.startCountDown(sec, playSound); hideUIWhileCountDown(); } diff --git a/src/com/android/camera/ui/CountDownView.java b/src/com/android/camera/ui/CountDownView.java index 7e1f28d52..d9d0244e5 100755 --- a/src/com/android/camera/ui/CountDownView.java +++ b/src/com/android/camera/ui/CountDownView.java @@ -67,6 +67,15 @@ public class CountDownView extends FrameLayout { } } + public void releaseSoundPool() { + if (mSoundPool != null) { + mSoundPool.unload(R.raw.beep_once); + mSoundPool.unload(R.raw.beep_twice); + mSoundPool.release(); + mSoundPool = null; + } + } + public boolean isCountingDown() { return mRemainingSecs > 0; }; |