diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-12-01 11:35:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-12-01 11:35:30 -0800 |
| commit | e9b0608c76bd19356f3141358ffdf134b7a9700f (patch) | |
| tree | 586185b7bef95d883a1f139d0a0be5038c4d2876 /policy | |
| parent | 4f9269323b2d8d945d33f9bd79d8b8c3ab6bc3b0 (diff) | |
| parent | 2b0acc90ae5a1133356b3af43d99056de1b3f626 (diff) | |
| download | frameworks_base-e9b0608c76bd19356f3141358ffdf134b7a9700f.zip frameworks_base-e9b0608c76bd19356f3141358ffdf134b7a9700f.tar.gz frameworks_base-e9b0608c76bd19356f3141358ffdf134b7a9700f.tar.bz2 | |
Merge "No clicking on volume icon in volume dialog." into ics-mr1
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/GlobalActions.java | 4 |
1 files changed, 2 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 f040e87..8052c80 100644 --- a/policy/src/com/android/internal/policy/impl/GlobalActions.java +++ b/policy/src/com/android/internal/policy/impl/GlobalActions.java @@ -121,8 +121,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac R.string.global_action_silent_mode_off_status) { void willCreate() { - mEnabledIconResId = (Settings.System.getInt(mContext.getContentResolver(), - Settings.System.VIBRATE_IN_SILENT, 1) == 1) + mEnabledIconResId = + mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE ? R.drawable.ic_audio_ring_notif_vibrate : R.drawable.ic_audio_vol_mute; } |