Tweak LatinIME's keypress volume
bug: 5337902 Change-Id: I7f864f158d110aa3e755961303799882f59b7e4cmain
parent
8efe9bb15a
commit
f58293f6eb
|
@ -0,0 +1,27 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!--
|
||||||
|
/*
|
||||||
|
**
|
||||||
|
** Copyright 2011, The Android Open Source Project
|
||||||
|
**
|
||||||
|
** Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
** you may not use this file except in compliance with the License.
|
||||||
|
** You may obtain a copy of the License at
|
||||||
|
**
|
||||||
|
** http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
**
|
||||||
|
** Unless required by applicable law or agreed to in writing, software
|
||||||
|
** distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
** See the License for the specific language governing permissions and
|
||||||
|
** limitations under the License.
|
||||||
|
*/
|
||||||
|
-->
|
||||||
|
<resources>
|
||||||
|
<string-array name="keypress_volumes" translatable="false">
|
||||||
|
<!-- Build.HARDWARE,volume -->
|
||||||
|
<item>herring,0.05</item>
|
||||||
|
<item>tuna,0.05</item>
|
||||||
|
<item>stingray,0.04</item>
|
||||||
|
</string-array>
|
||||||
|
</resources>
|
|
@ -210,7 +210,7 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
private long mLastKeyTime;
|
private long mLastKeyTime;
|
||||||
|
|
||||||
private AudioManager mAudioManager;
|
private AudioManager mAudioManager;
|
||||||
private static float mFxVolume = -1.0f; // just a default value to be updated runtime
|
private float mFxVolume = -1.0f; // default volume
|
||||||
private boolean mSilentModeOn; // System-wide current configuration
|
private boolean mSilentModeOn; // System-wide current configuration
|
||||||
|
|
||||||
private VibratorCompatWrapper mVibrator;
|
private VibratorCompatWrapper mVibrator;
|
||||||
|
@ -2051,13 +2051,14 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
|
|
||||||
// update sound effect volume
|
// update sound effect volume
|
||||||
private void updateSoundEffectVolume() {
|
private void updateSoundEffectVolume() {
|
||||||
if (mAudioManager == null) {
|
final String[] volumePerHardwareList = mResources.getStringArray(R.array.keypress_volumes);
|
||||||
mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
|
final String hardwarePrefix = Build.HARDWARE + ",";
|
||||||
if (mAudioManager == null) return;
|
for (final String element : volumePerHardwareList) {
|
||||||
|
if (element.startsWith(hardwarePrefix)) {
|
||||||
|
mFxVolume = Float.parseFloat(element.substring(element.lastIndexOf(',') + 1));
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// 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
|
||||||
|
@ -2091,17 +2092,20 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (isSoundOn()) {
|
if (isSoundOn()) {
|
||||||
int sound = AudioManager.FX_KEYPRESS_STANDARD;
|
final int sound;
|
||||||
switch (primaryCode) {
|
switch (primaryCode) {
|
||||||
case Keyboard.CODE_DELETE:
|
case Keyboard.CODE_DELETE:
|
||||||
sound = AudioManager.FX_KEYPRESS_DELETE;
|
sound = AudioManager.FX_KEYPRESS_DELETE;
|
||||||
break;
|
break;
|
||||||
case Keyboard.CODE_ENTER:
|
case Keyboard.CODE_ENTER:
|
||||||
sound = AudioManager.FX_KEYPRESS_RETURN;
|
sound = AudioManager.FX_KEYPRESS_RETURN;
|
||||||
break;
|
break;
|
||||||
case Keyboard.CODE_SPACE:
|
case Keyboard.CODE_SPACE:
|
||||||
sound = AudioManager.FX_KEYPRESS_SPACEBAR;
|
sound = AudioManager.FX_KEYPRESS_SPACEBAR;
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
sound = AudioManager.FX_KEYPRESS_STANDARD;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
mAudioManager.playSoundEffect(sound, mFxVolume);
|
mAudioManager.playSoundEffect(sound, mFxVolume);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue