From bdbb22bb3315bc22e1641fb8ecd150fc2de4a19d Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Wed, 7 Mar 2012 12:43:20 +0900
Subject: [PATCH] Simplification of sound settings (A4)
Change-Id: I0c6e207bae1e08c45a95b3479e1d67228d696792
---
.../latin/AudioAndHapticFeedbackManager.java | 20 ++++++++-----------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java b/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
index c8a4f3270e..21e9cdd21e 100644
--- a/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
+++ b/java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java
@@ -46,10 +46,9 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
mLatinIme = latinIme;
mSettingsValues = settingsValues;
mKeyboardSwitcher = keyboardSwitcher;
- mSoundOn = false;
mVibrator = VibratorCompatWrapper.getInstance(mLatinIme);
mAudioManager = (AudioManager) mLatinIme.getSystemService(Context.AUDIO_SERVICE);
- updateRingerMode();
+ mSoundOn = reevaluateIfSoundIsOn();
}
public void hapticAndAudioFeedback(final int primaryCode) {
@@ -57,23 +56,18 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
playKeyClick(primaryCode);
}
- private boolean isSoundOn() {
- return mSettingsValues.mSoundOn && mSoundOn;
- }
-
- // update flags for silent mode
- private void updateRingerMode() {
+ private boolean reevaluateIfSoundIsOn() {
if (!mSettingsValues.mSoundOn || mAudioManager == null) {
- mSoundOn = false;
+ return false;
} else {
- mSoundOn = (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL);
+ return mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL;
}
}
private void playKeyClick(int primaryCode) {
// if mAudioManager is null, we can't play a sound anyway, so return
if (mAudioManager == null) return;
- if (isSoundOn()) {
+ if (mSoundOn) {
final int sound;
switch (primaryCode) {
case Keyboard.CODE_DELETE:
@@ -114,8 +108,10 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
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)) {
- updateRingerMode();
+ mSoundOn = reevaluateIfSoundIsOn();
}
}
}
--
GitLab