aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-03-07 12:40:20 +0900
committerJean Chalard <jchalard@google.com>2012-03-08 18:36:19 +0900
commit2651b17fc4fb4457deb5078114b26d3a1ec66799 (patch)
tree506c1981c26a7e190b27691a634716a94a769f1b /java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
parent793791cdf0d54a55a73f931ffe3c62590c881f1e (diff)
downloadlatinime-2651b17fc4fb4457deb5078114b26d3a1ec66799.tar.gz
latinime-2651b17fc4fb4457deb5078114b26d3a1ec66799.tar.xz
latinime-2651b17fc4fb4457deb5078114b26d3a1ec66799.zip
Make a condition positive (A3)
mSoundOn is much easier to understand than mSilentModeOn Change-Id: Ie51c5c75fcad62e13e0fb578a266af80f15dc440
Diffstat (limited to 'java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java')
-rw-r--r--java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java b/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
index 8d54f50dd..c8a4f3270 100644
--- a/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
+++ b/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
@@ -39,14 +39,14 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
final private KeyboardSwitcher mKeyboardSwitcher;
final private AudioManager mAudioManager;
final private VibratorCompatWrapper mVibrator;
- private boolean mSilentModeOn;
+ private boolean mSoundOn;
public AudioAndHapticFeedbackManager(final LatinIME latinIme,
final SettingsValues settingsValues, final KeyboardSwitcher keyboardSwitcher) {
mLatinIme = latinIme;
mSettingsValues = settingsValues;
mKeyboardSwitcher = keyboardSwitcher;
- mSilentModeOn = true;
+ mSoundOn = false;
mVibrator = VibratorCompatWrapper.getInstance(mLatinIme);
mAudioManager = (AudioManager) mLatinIme.getSystemService(Context.AUDIO_SERVICE);
updateRingerMode();
@@ -58,15 +58,15 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
}
private boolean isSoundOn() {
- return mSettingsValues.mSoundOn && !mSilentModeOn;
+ return mSettingsValues.mSoundOn && mSoundOn;
}
// update flags for silent mode
private void updateRingerMode() {
if (!mSettingsValues.mSoundOn || mAudioManager == null) {
- mSilentModeOn = true;
+ mSoundOn = false;
} else {
- mSilentModeOn = (mAudioManager.getRingerMode() != AudioManager.RINGER_MODE_NORMAL);
+ mSoundOn = (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL);
}
}