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

Merge "Use vibrate icon in volume settings when appropriate." into ics-mr0

Browse Source
This commit is contained in:
Amith Yamasani
2011-10-28 19:40:42 -07:00
committed by Android (Google) Code Review
parent 6fded4ab3f ca7205842a
commit 480b2e4406
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/RingerVolumePreference.java
View File

@@ -116,9 +116,15 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
boolean muted = mAudioManager.isStreamMute(streamType); boolean muted = mAudioManager.isStreamMute(streamType);
if (mCheckBoxes[i] != null) { if (mCheckBoxes[i] != null) {
if (streamType == AudioManager.STREAM_RING && muted
&& mAudioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER)) {
mCheckBoxes[i].setImageResource(
com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
} else {
mCheckBoxes[i].setImageResource( mCheckBoxes[i].setImageResource(
muted ? SEEKBAR_MUTED_RES_ID[i] : SEEKBAR_UNMUTED_RES_ID[i]); muted ? SEEKBAR_MUTED_RES_ID[i] : SEEKBAR_UNMUTED_RES_ID[i]);
} }
}
if (mSeekBars[i] != null) { if (mSeekBars[i] != null) {
mSeekBars[i].setEnabled(!muted); mSeekBars[i].setEnabled(!muted);
final int volume = muted ? mAudioManager.getLastAudibleStreamVolume(streamType) final int volume = muted ? mAudioManager.getLastAudibleStreamVolume(streamType)
@@ -362,7 +368,11 @@ public class RingerVolumePreference extends VolumePreference implements OnClickL
// Touching any of the mute buttons causes us to get the state from the system and toggle it // Touching any of the mute buttons causes us to get the state from the system and toggle it
switch(mAudioManager.getRingerMode()) { switch(mAudioManager.getRingerMode()) {
case AudioManager.RINGER_MODE_NORMAL: case AudioManager.RINGER_MODE_NORMAL:
mAudioManager.setRingerMode(AudioManager.RINGER_MODE_SILENT); mAudioManager.setRingerMode(
(Settings.System.getInt(getContext().getContentResolver(),
Settings.System.VIBRATE_IN_SILENT, 1) == 1)
? AudioManager.RINGER_MODE_VIBRATE
: AudioManager.RINGER_MODE_SILENT);
break; break;
case AudioManager.RINGER_MODE_VIBRATE: case AudioManager.RINGER_MODE_VIBRATE:
case AudioManager.RINGER_MODE_SILENT: case AudioManager.RINGER_MODE_SILENT: