nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Simplification of sound settings (A4)"

main
Jean Chalard 2012-03-08 02:32:16 -08:00 committed by Android (Google) Code Review
parent d2b5ea2084 bdbb22bb33
commit 60705c9ed3
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,10 +46,9 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
mLatinIme = latinIme; mLatinIme = latinIme;
mSettingsValues = settingsValues; mSettingsValues = settingsValues;
mKeyboardSwitcher = keyboardSwitcher; mKeyboardSwitcher = keyboardSwitcher;
mSoundOn = false;
mVibrator = VibratorCompatWrapper.getInstance(mLatinIme); mVibrator = VibratorCompatWrapper.getInstance(mLatinIme);
mAudioManager = (AudioManager) mLatinIme.getSystemService(Context.AUDIO_SERVICE); mAudioManager = (AudioManager) mLatinIme.getSystemService(Context.AUDIO_SERVICE);
updateRingerMode(); mSoundOn = reevaluateIfSoundIsOn();
} }
public void hapticAndAudioFeedback(final int primaryCode) { public void hapticAndAudioFeedback(final int primaryCode) {
@ -57,23 +56,18 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
playKeyClick(primaryCode); playKeyClick(primaryCode);
} }
private boolean isSoundOn() { private boolean reevaluateIfSoundIsOn() {
return mSettingsValues.mSoundOn && mSoundOn;
}
// update flags for silent mode
private void updateRingerMode() {
if (!mSettingsValues.mSoundOn || mAudioManager == null) { if (!mSettingsValues.mSoundOn || mAudioManager == null) {
mSoundOn = false; return false;
} else { } else {
mSoundOn = (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL); return mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL;
} }
} }
private void playKeyClick(int primaryCode) { private void playKeyClick(int primaryCode) {
// if mAudioManager is null, we can't play a sound anyway, so return // if mAudioManager is null, we can't play a sound anyway, so return
if (mAudioManager == null) return; if (mAudioManager == null) return;
if (isSoundOn()) { if (mSoundOn) {
final int sound; final int sound;
switch (primaryCode) { switch (primaryCode) {
case Keyboard.CODE_DELETE: case Keyboard.CODE_DELETE:
@ -114,8 +108,10 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
final String action = intent.getAction(); final String action = intent.getAction();
// The following test is supposedly useless since we only listen for the ringer event.
// Still, it's a good safety measure.
if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) { if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) {
updateRingerMode(); mSoundOn = reevaluateIfSoundIsOn();
} }
} }
} }