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

Merge "Key click sound volume fix"

main
Ken Wakasa 2011-08-11 10:06:49 -07:00 committed by Android (Google) Code Review
parent f7c449b649 bf7dd47329
commit 7fca6a5357
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java/src/com/android/inputmethod/latin/LatinIME.java
View File

@ -190,8 +190,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
private long mLastKeyTime; private long mLastKeyTime;
private AudioManager mAudioManager; private AudioManager mAudioManager;
// Align sound effect volume on music volume private static float mFxVolume = -1.0f; // just a default value to be updated runtime
private static final float FX_VOLUME = -1.0f;
private boolean mSilentModeOn; // System-wide current configuration private boolean mSilentModeOn; // System-wide current configuration
// TODO: Move this flag to VoiceProxy // TODO: Move this flag to VoiceProxy
@ -510,6 +509,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
if (null == mSubtypeSwitcher) mSubtypeSwitcher = SubtypeSwitcher.getInstance(); if (null == mSubtypeSwitcher) mSubtypeSwitcher = SubtypeSwitcher.getInstance();
mSettingsValues = new Settings.Values(mPrefs, this, mSubtypeSwitcher.getInputLocaleStr()); mSettingsValues = new Settings.Values(mPrefs, this, mSubtypeSwitcher.getInputLocaleStr());
resetContactsDictionary(null == mSuggest ? null : mSuggest.getContactsDictionary()); resetContactsDictionary(null == mSuggest ? null : mSuggest.getContactsDictionary());
updateSoundEffectVolume();
} }
private void initSuggest() { private void initSuggest() {
@ -2068,15 +2068,25 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
}; };
// update sound effect volume
private void updateSoundEffectVolume() {
if (mAudioManager == null) {
mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
if (mAudioManager == null) return;
}
// This aligns with the current media volume minus 6dB
mFxVolume = (float) mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
/ (float) mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC) / 4.0f;
}
// update flags for silent mode // update flags for silent mode
private void updateRingerMode() { private void updateRingerMode() {
if (mAudioManager == null) { if (mAudioManager == null) {
mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE); mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
if (mAudioManager == null) return;
} }
if (mAudioManager != null) {
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 don't have the ringer state yet
@ -2087,8 +2097,6 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
} }
} }
if (isSoundOn()) { if (isSoundOn()) {
// FIXME: Volume and enable should come from UI settings
// FIXME: These should be triggered after auto-repeat logic
int sound = AudioManager.FX_KEYPRESS_STANDARD; int sound = AudioManager.FX_KEYPRESS_STANDARD;
switch (primaryCode) { switch (primaryCode) {
case Keyboard.CODE_DELETE: case Keyboard.CODE_DELETE:
@ -2101,7 +2109,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
sound = AudioManager.FX_KEYPRESS_SPACEBAR; sound = AudioManager.FX_KEYPRESS_SPACEBAR;
break; break;
} }
mAudioManager.playSoundEffect(sound, FX_VOLUME); mAudioManager.playSoundEffect(sound, mFxVolume);
} }
} }