aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-03-08 02:32:07 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-08 02:32:07 -0800
commitd2b5ea2084fe4eeed11ddcf82b7681a13683f8b1 (patch)
treec79afc217e33df8bfa12292193e26d3a3e922b03 /java/src
parentd749fb86ab59cdaeee1580ac3e3e8584913c3546 (diff)
parent2651b17fc4fb4457deb5078114b26d3a1ec66799 (diff)
downloadlatinime-d2b5ea2084fe4eeed11ddcf82b7681a13683f8b1.tar.gz
latinime-d2b5ea2084fe4eeed11ddcf82b7681a13683f8b1.tar.xz
latinime-d2b5ea2084fe4eeed11ddcf82b7681a13683f8b1.zip
Merge "Make a condition positive (A3)"
Diffstat (limited to 'java/src')
-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);
}
}