diff options
| author | Eric Laurent <elaurent@google.com> | 2013-03-28 22:27:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-28 22:27:45 +0000 |
| commit | 899e4f27f1866acee29c67e6f19b50308a3b12c3 (patch) | |
| tree | e98bfa0cc28e63e530b62460f36a5742d46fb150 /src/com/android | |
| parent | a86453096979d027d65390f657568c945fea1b3d (diff) | |
| parent | 2c2bf97dd4ec9bbf2f7d6da985c9ee87868169e3 (diff) | |
| download | packages_apps_Settings-899e4f27f1866acee29c67e6f19b50308a3b12c3.zip packages_apps_Settings-899e4f27f1866acee29c67e6f19b50308a3b12c3.tar.gz packages_apps_Settings-899e4f27f1866acee29c67e6f19b50308a3b12c3.tar.bz2 | |
Merge "Display vibrate icon in volume menu" into jb-mr2-dev
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/settings/RingerVolumePreference.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java index 954213d..56393e0 100644 --- a/src/com/android/settings/RingerVolumePreference.java +++ b/src/com/android/settings/RingerVolumePreference.java @@ -115,7 +115,8 @@ public class RingerVolumePreference extends VolumePreference { boolean muted = mAudioManager.isStreamMute(streamType); if (mCheckBoxes[i] != null) { - if ((streamType == AudioManager.STREAM_RING) && + if (((streamType == AudioManager.STREAM_RING) || + (streamType == AudioManager.STREAM_NOTIFICATION)) && (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE)) { mCheckBoxes[i].setImageResource( com.android.internal.R.drawable.ic_audio_ring_notif_vibrate); |