diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-10-30 21:37:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-30 21:37:09 +0000 |
| commit | 18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb (patch) | |
| tree | 48f209ead50adb66c5ae28dfd04e5a67906d0732 /policy/src | |
| parent | bce45617083209583d61afbea50994f2cdcda459 (diff) | |
| parent | 69e640ee84fc218d6318acaf73a1c1841d7fba6b (diff) | |
| download | frameworks_base-18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb.zip frameworks_base-18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb.tar.gz frameworks_base-18936d7d1d0964ba3f5112c5e3ce60f31e1ba5bb.tar.bz2 | |
am 69e640ee: Merge "Bring back the old-style Ring/Vibrate/Silent states when using volume keys." into ics-mr0
* commit '69e640ee84fc218d6318acaf73a1c1841d7fba6b':
Bring back the old-style Ring/Vibrate/Silent states when using volume keys.
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/GlobalActions.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/GlobalActions.java b/policy/src/com/android/internal/policy/impl/GlobalActions.java index 11b6c15..f040e87 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -121,10 +121,9 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac R.string.global_action_silent_mode_off_status) { void willCreate() { - // XXX: FIXME: Add vibrate indicator when available mEnabledIconResId = (Settings.System.getInt(mContext.getContentResolver(), Settings.System.VIBRATE_IN_SILENT, 1) == 1) - ? R.drawable.ic_audio_vol_mute + ? R.drawable.ic_audio_ring_notif_vibrate : R.drawable.ic_audio_vol_mute; } |