am dd379184: am f0746678: Merge "Redesign vibration settings." into froyo (a9523ed0) · Commits · e / os / android_packages_apps_Settings

res/values/arrays.xml

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -388,14 +388,16 @@
	<!-- New incoming call vibrate options. -->		<!-- New incoming call vibrate options. -->
	<string-array name="vibrate_entries">		<string-array name="vibrate_entries">
	<item>Always</item>		<item>Always</item>
	<item>Only when silent</item>
	<item>Never</item>		<item>Never</item>
			<item>Only in Silent mode</item>
			<item>Only when not in Silent mode</item>
	</string-array>		</string-array>

	<!-- Corresponds to AudioManager.VIBRATE_SETTING_*. Do not translate. -->		<!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
	<string-array name="vibrate_values" translatable="false">		<string-array name="vibrate_values" translatable="false">
	<item>1</item>		<item>always</item>
	<item>2</item>		<item>never</item>
	<item>0</item>		<item>silent</item>
			<item>notsilent</item>
	</string-array>		</string-array>
	</resources>		</resources>

res/values/strings.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1022,9 +1022,9 @@
	<!-- Sound settings screen, setting option summary text -->		<!-- Sound settings screen, setting option summary text -->
	<string name="vibrate_in_silent_summary">Allow vibration feedback in silent mode</string>		<string name="vibrate_in_silent_summary">Allow vibration feedback in silent mode</string>
	<!-- Sound settings screen, setting option name checkbox -->		<!-- Sound settings screen, setting option name checkbox -->
	<string name="vibrate_title">Phone vibrate</string>		<string name="vibrate_title">Vibrate</string>
	<!-- Sound settings screen, setting option summary text -->		<!-- Sound settings screen, setting option summary text -->
	<string name="vibrate_summary">Vibrate phone for incoming calls</string>		<string name="vibrate_summary">Vibration feedback for calls and notifications</string>
	<!-- Sound settings screen, setting option name -->		<!-- Sound settings screen, setting option name -->
	<string name="notification_sound_title">Notification ringtone</string>		<string name="notification_sound_title">Notification ringtone</string>
	<!-- Sound settings screen, setting option summary text -->		<!-- Sound settings screen, setting option summary text -->

res/xml/sound_settings.xml

+7 −14

Original line number	Original line	Diff line number	Diff line
	@@ -31,12 +31,13 @@
	android:order="1"		android:order="1"
	android:disableDependentsState="true" />		android:disableDependentsState="true" />

	<CheckBoxPreference		<ListPreference
	android:key="vibrate_in_silent"		android:key="vibrate"
	android:title="@string/vibrate_in_silent_title"		android:order="6"
	android:summary="@string/vibrate_in_silent_summary"		android:title="@string/vibrate_title"
	android:order="2"		android:summary="@string/vibrate_summary"
	android:persistent="false" />		android:entries="@array/vibrate_entries"
			android:entryValues="@array/vibrate_values" />

	<com.android.settings.RingerVolumePreference		<com.android.settings.RingerVolumePreference
	android:key="ring_volume"		android:key="ring_volume"
	@@ -63,14 +64,6 @@
	android:order="5"		android:order="5"
	android:ringtoneType="ringtone" />		android:ringtoneType="ringtone" />

	<ListPreference
	android:key="vibrate"
	android:order="6"
	android:title="@string/vibrate_title"
	android:summary="@string/vibrate_summary"
	android:entries="@array/vibrate_entries"
	android:entryValues="@array/vibrate_values" />

	</PreferenceCategory>		</PreferenceCategory>

	<PreferenceCategory		<PreferenceCategory

src/com/android/settings/SoundSettings.java

+91 −41

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,6 @@ public class SoundSettings extends PreferenceActivity implements

	private static final String KEY_SILENT = "silent";		private static final String KEY_SILENT = "silent";
	private static final String KEY_VIBRATE = "vibrate";		private static final String KEY_VIBRATE = "vibrate";
	private static final String KEY_VIBRATE_IN_SILENT = "vibrate_in_silent";
	private static final String KEY_DTMF_TONE = "dtmf_tone";		private static final String KEY_DTMF_TONE = "dtmf_tone";
	private static final String KEY_SOUND_EFFECTS = "sound_effects";		private static final String KEY_SOUND_EFFECTS = "sound_effects";
	private static final String KEY_HAPTIC_FEEDBACK = "haptic_feedback";		private static final String KEY_HAPTIC_FEEDBACK = "haptic_feedback";
	@@ -58,6 +57,11 @@ public class SoundSettings extends PreferenceActivity implements
	private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";		private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
	private static final String KEY_LOCK_SOUNDS = "lock_sounds";		private static final String KEY_LOCK_SOUNDS = "lock_sounds";

			private static final String VALUE_VIBRATE_NEVER = "never";
			private static final String VALUE_VIBRATE_ALWAYS = "always";
			private static final String VALUE_VIBRATE_ONLY_SILENT = "silent";
			private static final String VALUE_VIBRATE_UNLESS_SILENT = "notsilent";

	private CheckBoxPreference mSilent;		private CheckBoxPreference mSilent;

	/*		/*
	@@ -67,8 +71,7 @@ public class SoundSettings extends PreferenceActivity implements
	* Otherwise, it will adjust the normal ringer mode's ring or ring+vibrate		* Otherwise, it will adjust the normal ringer mode's ring or ring+vibrate
	* setting.		* setting.
	*/		*/
	private ListPreference mPhoneVibrate;		private ListPreference mVibrate;
	private CheckBoxPreference mVibrateInSilent;
	private CheckBoxPreference mDtmfTone;		private CheckBoxPreference mDtmfTone;
	private CheckBoxPreference mSoundEffects;		private CheckBoxPreference mSoundEffects;
	private CheckBoxPreference mHapticFeedback;		private CheckBoxPreference mHapticFeedback;
	@@ -105,10 +108,9 @@ public class SoundSettings extends PreferenceActivity implements

	mSilent = (CheckBoxPreference) findPreference(KEY_SILENT);		mSilent = (CheckBoxPreference) findPreference(KEY_SILENT);

	mPhoneVibrate = (ListPreference) findPreference(KEY_VIBRATE);		mVibrate = (ListPreference) findPreference(KEY_VIBRATE);
	mPhoneVibrate.setOnPreferenceChangeListener(this);		mVibrate.setOnPreferenceChangeListener(this);

	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);
	mDtmfTone.setChecked(Settings.System.getInt(resolver,		mDtmfTone.setChecked(Settings.System.getInt(resolver,
	@@ -169,6 +171,78 @@ public class SoundSettings extends PreferenceActivity implements
	unregisterReceiver(mReceiver);		unregisterReceiver(mReceiver);
	}		}

			private String getPhoneVibrateSettingValue() {
			boolean vibeInSilent = (Settings.System.getInt(
			getContentResolver(),
			Settings.System.VIBRATE_IN_SILENT,
			1) == 1);

			// Control phone vibe independent of silent mode
			int callsVibrateSetting =
			mAudioManager.getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER);

			if (vibeInSilent) {
			if (callsVibrateSetting == AudioManager.VIBRATE_SETTING_OFF) {
			// this state does not make sense; fix it up for the user
			mAudioManager.setVibrateSetting(
			AudioManager.VIBRATE_TYPE_RINGER,
			AudioManager.VIBRATE_SETTING_ONLY_SILENT);
			}
			if (callsVibrateSetting == AudioManager.VIBRATE_SETTING_ON) {
			return VALUE_VIBRATE_ALWAYS;
			} else {
			return VALUE_VIBRATE_ONLY_SILENT;
			}
			} else {
			if (callsVibrateSetting == AudioManager.VIBRATE_SETTING_ONLY_SILENT) {
			// this state does not make sense; fix it up
			mAudioManager.setVibrateSetting(
			AudioManager.VIBRATE_TYPE_RINGER,
			AudioManager.VIBRATE_SETTING_OFF);
			}
			if (callsVibrateSetting == AudioManager.VIBRATE_SETTING_ON) {
			return VALUE_VIBRATE_UNLESS_SILENT;
			} else {
			return VALUE_VIBRATE_NEVER;
			}
			}
			}

			private void setPhoneVibrateSettingValue(String value) {
			boolean vibeInSilent;
			int callsVibrateSetting;

			if (value.equals(VALUE_VIBRATE_UNLESS_SILENT)) {
			callsVibrateSetting = AudioManager.VIBRATE_SETTING_ON;
			vibeInSilent = false;
			} else if (value.equals(VALUE_VIBRATE_NEVER)) {
			callsVibrateSetting = AudioManager.VIBRATE_SETTING_OFF;
			vibeInSilent = false;
			} else if (value.equals(VALUE_VIBRATE_ONLY_SILENT)) {
			callsVibrateSetting = AudioManager.VIBRATE_SETTING_ONLY_SILENT;
			vibeInSilent = true;
			} else { //VALUE_VIBRATE_ALWAYS
			callsVibrateSetting = AudioManager.VIBRATE_SETTING_ON;
			vibeInSilent = true;
			}

			Settings.System.putInt(getContentResolver(),
			Settings.System.VIBRATE_IN_SILENT,
			vibeInSilent ? 1 : 0);

			// might need to switch the ringer mode from one kind of "silent" to
			// another
			if (mSilent.isChecked()) {
			mAudioManager.setRingerMode(
			vibeInSilent ? AudioManager.RINGER_MODE_VIBRATE
			: AudioManager.RINGER_MODE_SILENT);
			}

			mAudioManager.setVibrateSetting(
			AudioManager.VIBRATE_TYPE_RINGER,
			callsVibrateSetting);
			}

	// updateState in fact updates the UI to reflect the system state		// updateState in fact updates the UI to reflect the system state
	private void updateState(boolean force) {		private void updateState(boolean force) {
	final int ringerMode = mAudioManager.getRingerMode();		final int ringerMode = mAudioManager.getRingerMode();
	@@ -183,18 +257,12 @@ public class SoundSettings extends PreferenceActivity implements
	mSilent.setChecked(silentOrVibrateMode);		mSilent.setChecked(silentOrVibrateMode);
	}		}

	mVibrateInSilent.setChecked(Settings.System.getInt(		String phoneVibrateSetting = getPhoneVibrateSettingValue();
	getContentResolver(),
	Settings.System.VIBRATE_IN_SILENT,
	1) == 1);

	// Control phone vibe independent of silent mode
	String phoneVibrateSetting = String.valueOf(
	mAudioManager.getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER));

	if (! phoneVibrateSetting.equals(mPhoneVibrate.getValue()) \|\| force) {		if (! phoneVibrateSetting.equals(mVibrate.getValue()) \|\| force) {
	mPhoneVibrate.setValue(phoneVibrateSetting);		mVibrate.setValue(phoneVibrateSetting);
	}		}
			mVibrate.setSummary(mVibrate.getEntry());

	int silentModeStreams = Settings.System.getInt(getContentResolver(),		int silentModeStreams = Settings.System.getInt(getContentResolver(),
	Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);		Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
	@@ -202,14 +270,16 @@ public class SoundSettings extends PreferenceActivity implements
	mSilent.setSummary(isAlarmInclSilentMode ?		mSilent.setSummary(isAlarmInclSilentMode ?
	R.string.silent_mode_incl_alarm_summary :		R.string.silent_mode_incl_alarm_summary :
	R.string.silent_mode_summary);		R.string.silent_mode_summary);

	}		}

	@Override		@Override
	public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {		public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
	if (preference == mSilent) {		if (preference == mSilent) {
	if (mSilent.isChecked()) {		if (mSilent.isChecked()) {
	boolean vibeInSilent = mVibrateInSilent.isChecked();		boolean vibeInSilent = (1 == Settings.System.getInt(
			getContentResolver(),
			Settings.System.VIBRATE_IN_SILENT,
			1));
	mAudioManager.setRingerMode(		mAudioManager.setRingerMode(
	vibeInSilent ? AudioManager.RINGER_MODE_VIBRATE		vibeInSilent ? AudioManager.RINGER_MODE_VIBRATE
	: AudioManager.RINGER_MODE_SILENT);		: AudioManager.RINGER_MODE_SILENT);
	@@ -217,17 +287,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 == mVibrateInSilent) {
	boolean vibeInSilent = mVibrateInSilent.isChecked();
	Settings.System.putInt(getContentResolver(),
	Settings.System.VIBRATE_IN_SILENT,
	vibeInSilent ? 1 : 0);
	int ringerMode = mAudioManager.getRingerMode();
	if (ringerMode != AudioManager.RINGER_MODE_NORMAL) {
	mAudioManager.setRingerMode(vibeInSilent
	? AudioManager.RINGER_MODE_VIBRATE
	: AudioManager.RINGER_MODE_SILENT);
	}
	} else if (preference == mDtmfTone) {		} else if (preference == mDtmfTone) {
	Settings.System.putInt(getContentResolver(), Settings.System.DTMF_TONE_WHEN_DIALING,		Settings.System.putInt(getContentResolver(), Settings.System.DTMF_TONE_WHEN_DIALING,
	mDtmfTone.isChecked() ? 1 : 0);		mDtmfTone.isChecked() ? 1 : 0);
	@@ -268,18 +327,9 @@ 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) {		} else if (preference == mVibrate) {
	int vibeSetting = new Integer(objValue.toString()).intValue();		setPhoneVibrateSettingValue(objValue.toString());
	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);		updateState(false);
	break;
	}
	}		}

	return true;		return true;