Simplification of sound settings (A4) (bdbb22bb) · Commits · e / os / android_packages_inputmethods_LatinIME

java/src/com/android/inputmethod/latin/AudioAndHapticFeedbackManager.java

+8 −12

Original line number	Original line	Diff line number	Diff line
	@@ -46,10 +46,9 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
	mLatinIme = latinIme;		mLatinIme = latinIme;
	mSettingsValues = settingsValues;		mSettingsValues = settingsValues;
	mKeyboardSwitcher = keyboardSwitcher;		mKeyboardSwitcher = keyboardSwitcher;
	mSoundOn = false;
	mVibrator = VibratorCompatWrapper.getInstance(mLatinIme);		mVibrator = VibratorCompatWrapper.getInstance(mLatinIme);
	mAudioManager = (AudioManager) mLatinIme.getSystemService(Context.AUDIO_SERVICE);		mAudioManager = (AudioManager) mLatinIme.getSystemService(Context.AUDIO_SERVICE);
	updateRingerMode();		mSoundOn = reevaluateIfSoundIsOn();
	}		}

	public void hapticAndAudioFeedback(final int primaryCode) {		public void hapticAndAudioFeedback(final int primaryCode) {
	@@ -57,23 +56,18 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
	playKeyClick(primaryCode);		playKeyClick(primaryCode);
	}		}

	private boolean isSoundOn() {		private boolean reevaluateIfSoundIsOn() {
	return mSettingsValues.mSoundOn && mSoundOn;
	}

	// update flags for silent mode
	private void updateRingerMode() {
	if (!mSettingsValues.mSoundOn \|\| mAudioManager == null) {		if (!mSettingsValues.mSoundOn \|\| mAudioManager == null) {
	mSoundOn = false;		return false;
	} else {		} else {
	mSoundOn = (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL);		return mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_NORMAL;
	}		}
	}		}

	private void playKeyClick(int primaryCode) {		private void playKeyClick(int primaryCode) {
	// if mAudioManager is null, we can't play a sound anyway, so return		// if mAudioManager is null, we can't play a sound anyway, so return
	if (mAudioManager == null) return;		if (mAudioManager == null) return;
	if (isSoundOn()) {		if (mSoundOn) {
	final int sound;		final int sound;
	switch (primaryCode) {		switch (primaryCode) {
	case Keyboard.CODE_DELETE:		case Keyboard.CODE_DELETE:
	@@ -114,8 +108,10 @@ public class AudioAndHapticFeedbackManager extends BroadcastReceiver {
	@Override		@Override
	public void onReceive(Context context, Intent intent) {		public void onReceive(Context context, Intent intent) {
	final String action = intent.getAction();		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)) {		if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) {
	updateRingerMode();		mSoundOn = reevaluateIfSoundIsOn();
	}		}
	}		}
	}		}