PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix vibrate settings for incoming calls."

Browse Source
This commit is contained in:
Daniel Sandler
2010-03-08 12:10:39 -08:00
committed by Android (Google) Code Review
parent cc06afa605 4ce4f759bd
commit b8955defaf
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/settings/SoundSettings.java
View File

@@ -106,6 +106,8 @@ public class SoundSettings extends PreferenceActivity implements
mSilent = (CheckBoxPreference) findPreference(KEY_SILENT); mSilent = (CheckBoxPreference) findPreference(KEY_SILENT);
mPhoneVibrate = (ListPreference) findPreference(KEY_VIBRATE); mPhoneVibrate = (ListPreference) findPreference(KEY_VIBRATE);
mPhoneVibrate.setOnPreferenceChangeListener(this);
mVibrateInSilent = (CheckBoxPreference) findPreference(KEY_VIBRATE_IN_SILENT); mVibrateInSilent = (CheckBoxPreference) findPreference(KEY_VIBRATE_IN_SILENT);
mDtmfTone = (CheckBoxPreference) findPreference(KEY_DTMF_TONE); mDtmfTone = (CheckBoxPreference) findPreference(KEY_DTMF_TONE);
mDtmfTone.setPersistent(false); mDtmfTone.setPersistent(false);
@@ -216,18 +218,6 @@ public class SoundSettings extends PreferenceActivity implements
mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL); mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
} }
updateState(false); updateState(false);
} else if (preference == mPhoneVibrate) {
int vibeSetting = new Integer(mPhoneVibrate.getValue()).intValue();
switch (vibeSetting) {
case AudioManager.VIBRATE_SETTING_ON:
case AudioManager.VIBRATE_SETTING_OFF:
case AudioManager.VIBRATE_SETTING_ONLY_SILENT:
mAudioManager.setVibrateSetting(
AudioManager.VIBRATE_TYPE_RINGER,
vibeSetting);
updateState(false);
break;
}
} else if (preference == mVibrateInSilent) { } else if (preference == mVibrateInSilent) {
boolean vibeInSilent = mVibrateInSilent.isChecked(); boolean vibeInSilent = mVibrateInSilent.isChecked();
Settings.System.putInt(getContentResolver(), Settings.System.putInt(getContentResolver(),
@@ -279,6 +269,18 @@ public class SoundSettings extends PreferenceActivity implements
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
Log.e(TAG, "could not persist emergency tone setting", e); Log.e(TAG, "could not persist emergency tone setting", e);
} }
} else if (preference == mPhoneVibrate) {
int vibeSetting = new Integer(objValue.toString()).intValue();
switch (vibeSetting) {
case AudioManager.VIBRATE_SETTING_ON:
case AudioManager.VIBRATE_SETTING_OFF:
case AudioManager.VIBRATE_SETTING_ONLY_SILENT:
mAudioManager.setVibrateSetting(
AudioManager.VIBRATE_TYPE_RINGER,
vibeSetting);
updateState(false);
break;
}
} }
return true; return true;