diff options
| author | John Spurlock <jspurlock@google.com> | 2015-04-10 02:07:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-10 02:07:52 +0000 |
| commit | 11145938bb2b1a46432f27a0cc20fe52e254c7f2 (patch) | |
| tree | d5d4db333113e16cc41c9cb7c5038decb36f77f8 /packages/SystemUI/src/com/android/systemui | |
| parent | ec88e8956cc45609450302e346e862d238733a41 (diff) | |
| parent | f15ef112e79ce294719ef5fb108036020940340c (diff) | |
| download | frameworks_base-11145938bb2b1a46432f27a0cc20fe52e254c7f2.zip frameworks_base-11145938bb2b1a46432f27a0cc20fe52e254c7f2.tar.gz frameworks_base-11145938bb2b1a46432f27a0cc20fe52e254c7f2.tar.bz2 | |
Merge "Volume: Update media bluetooth icons."
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java index 8d336ab..539fec8 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java @@ -691,7 +691,8 @@ public class VolumeDialog { final int iconRes = isRingVibrate ? R.drawable.ic_volume_ringer_vibrate : ss.routedToBluetooth ? - (ss.muted ? R.drawable.ic_volume_bt_mute : R.drawable.ic_volume_bt) + (ss.muted ? R.drawable.ic_volume_media_bt_mute + : R.drawable.ic_volume_media_bt) : mAutomute && ss.level == 0 ? row.iconMuteRes : (ss.muted ? row.iconMuteRes : row.iconRes); if (iconRes != row.cachedIconRes) { @@ -703,9 +704,9 @@ public class VolumeDialog { } row.iconState = iconRes == R.drawable.ic_volume_ringer_vibrate ? Events.ICON_STATE_VIBRATE - : (iconRes == R.drawable.ic_volume_bt_mute || iconRes == row.iconMuteRes) + : (iconRes == R.drawable.ic_volume_media_bt_mute || iconRes == row.iconMuteRes) ? Events.ICON_STATE_MUTE - : (iconRes == R.drawable.ic_volume_bt || iconRes == row.iconRes) + : (iconRes == R.drawable.ic_volume_media_bt || iconRes == row.iconRes) ? Events.ICON_STATE_UNMUTE : Events.ICON_STATE_UNKNOWN; |