diff options
| author | Amith Yamasani <yamasani@google.com> | 2011-11-29 16:32:17 -0800 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2011-11-30 15:28:43 -0800 |
| commit | 2b0acc90ae5a1133356b3af43d99056de1b3f626 (patch) | |
| tree | b1ec75ddd9e1264ddabb72ee0952810e4a3b1a73 /policy | |
| parent | e5715521232443f01f8c0c0633cac364c8136bde (diff) | |
| download | frameworks_base-2b0acc90ae5a1133356b3af43d99056de1b3f626.zip frameworks_base-2b0acc90ae5a1133356b3af43d99056de1b3f626.tar.gz frameworks_base-2b0acc90ae5a1133356b3af43d99056de1b3f626.tar.bz2 | |
No clicking on volume icon in volume dialog.
Don't disable volume slider when it hits zero.
Show correct icon for Silent mode in Power menu.
Bug: 5586083
Change-Id: Iaa957fc08e314e0de1c007dfc967a1d960080aab
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; } |