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

Merge "Implement new volume display policy." into jb-dev

Browse Source
This commit is contained in:
Eric Laurent
2012-05-14 16:30:41 -07:00
committed by Android (Google) Code Review
parent 1cbd519ebc 9d078e984e
commit 106368400d
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,8 +116,8 @@ public class RingerVolumePreference extends VolumePreference {
boolean muted = mAudioManager.isStreamMute(streamType); boolean muted = mAudioManager.isStreamMute(streamType);
if (mCheckBoxes[i] != null) { if (mCheckBoxes[i] != null) {
if (streamType == AudioManager.STREAM_RING && muted if ((streamType == AudioManager.STREAM_RING) &&
&& !(mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_SILENT)) { (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE)) {
mCheckBoxes[i].setImageResource( mCheckBoxes[i].setImageResource(
com.android.internal.R.drawable.ic_audio_ring_notif_vibrate); com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
} else { } else {
@@ -126,9 +126,13 @@ public class RingerVolumePreference extends VolumePreference {
} }
} }
if (mSeekBars[i] != null) { if (mSeekBars[i] != null) {
final int volume = muted ? mAudioManager.getLastAudibleStreamVolume(streamType) final int volume = mAudioManager.getStreamVolume(streamType);
: mAudioManager.getStreamVolume(streamType);
mSeekBars[i].setProgress(volume); mSeekBars[i].setProgress(volume);
if (streamType != mAudioManager.getMasterStreamType() && muted) {
mSeekBars[i].setEnabled(false);
} else {
mSeekBars[i].setEnabled(true);
}
} }
} }
} }
@@ -169,9 +173,6 @@ public class RingerVolumePreference extends VolumePreference {
} }
} }
final int silentableStreams = System.getInt(getContext().getContentResolver(),
System.MODE_RINGER_STREAMS_AFFECTED,
((1 << AudioSystem.STREAM_NOTIFICATION) | (1 << AudioSystem.STREAM_RING)));
// Register callbacks for mute/unmute buttons // Register callbacks for mute/unmute buttons
for (int i = 0; i < mCheckBoxes.length; i++) { for (int i = 0; i < mCheckBoxes.length; i++) {
ImageView checkbox = (ImageView) view.findViewById(CHECKBOX_VIEW_ID[i]); ImageView checkbox = (ImageView) view.findViewById(CHECKBOX_VIEW_ID[i]);