n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "Simplify audio management (A2)"

Browse Source
This commit is contained in:
Jean Chalard 2012-03-08 02:31:57 -08:00 committed by Android (Google) Code Review
commit d749fb86ab
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
View File

@ -37,7 +37,7 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
final private LatinIME mLatinIme; final private LatinIME mLatinIme;
final private SettingsValues mSettingsValues; final private SettingsValues mSettingsValues;
final private KeyboardSwitcher mKeyboardSwitcher; final private KeyboardSwitcher mKeyboardSwitcher;
private AudioManager mAudioManager; final private AudioManager mAudioManager;
final private VibratorCompatWrapper mVibrator; final private VibratorCompatWrapper mVibrator;
private boolean mSilentModeOn; private boolean mSilentModeOn;
@ -48,6 +48,8 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
mKeyboardSwitcher = keyboardSwitcher; mKeyboardSwitcher = keyboardSwitcher;
mSilentModeOn = true; mSilentModeOn = true;
mVibrator = VibratorCompatWrapper.getInstance(mLatinIme); mVibrator = VibratorCompatWrapper.getInstance(mLatinIme);
mAudioManager = (AudioManager) mLatinIme.getSystemService(Context.AUDIO_SERVICE);
updateRingerMode();
} }
public void hapticAndAudioFeedback(final int primaryCode) { public void hapticAndAudioFeedback(final int primaryCode) {
@ -61,21 +63,16 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
// update flags for silent mode // update flags for silent mode
private void updateRingerMode() { private void updateRingerMode() {
if (mAudioManager == null) { if (!mSettingsValues.mSoundOn || mAudioManager == null) {
mAudioManager = (AudioManager) mLatinIme.getSystemService(Context.AUDIO_SERVICE); mSilentModeOn = true;
if (mAudioManager == null) return; } else {
}
mSilentModeOn = (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_NORMAL); mSilentModeOn = (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_NORMAL);
} }
}
private void playKeyClick(int primaryCode) { private void playKeyClick(int primaryCode) {
// if mAudioManager is null, we don't have the ringer state yet // if mAudioManager is null, we can't play a sound anyway, so return
// mAudioManager will be set by updateRingerMode if (mAudioManager == null) return;
if (mAudioManager == null) {
if (mKeyboardSwitcher.getKeyboardView() != null) {
updateRingerMode();
}
}
if (isSoundOn()) { if (isSoundOn()) {
final int sound; final int sound;
switch (primaryCode) { switch (primaryCode) {