diff options
| author | John Spurlock <jspurlock@google.com> | 2014-10-02 19:17:19 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-10-02 20:11:37 -0400 |
| commit | 4bebb1dc5e682808ab5c0118c9340957eca52cd8 (patch) | |
| tree | d4f79dfa066b737ddff868ce44c7e19f142bbfbe /packages/SystemUI/src/com/android/systemui/volume | |
| parent | 9f64867da107b772b867876ddf979d1a3ec19192 (diff) | |
| download | frameworks_base-4bebb1dc5e682808ab5c0118c9340957eca52cd8.zip frameworks_base-4bebb1dc5e682808ab5c0118c9340957eca52cd8.tar.gz frameworks_base-4bebb1dc5e682808ab5c0118c9340957eca52cd8.tar.bz2 | |
Update framework icons for media & alarm streams.
Update resources to new style and remove obsolete items.
Bug: 17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java index 40bdea2..360dee5 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java @@ -127,6 +127,9 @@ public class VolumePanel extends Handler { .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION) .build(); + private static final int IC_AUDIO_VOL = com.android.systemui.R.drawable.ic_audio_vol; + private static final int IC_AUDIO_VOL_MUTE = com.android.systemui.R.drawable.ic_audio_vol_mute; + private final String mTag; protected final Context mContext; private final AudioManager mAudioManager; @@ -182,13 +185,13 @@ public class VolumePanel extends Handler { false), AlarmStream(AudioManager.STREAM_ALARM, R.string.volume_alarm, - R.drawable.ic_audio_alarm, - R.drawable.ic_audio_alarm_mute, + com.android.systemui.R.drawable.ic_audio_alarm, + com.android.systemui.R.drawable.ic_audio_alarm_mute, false), MediaStream(AudioManager.STREAM_MUSIC, R.string.volume_icon_description_media, - R.drawable.ic_audio_vol, - R.drawable.ic_audio_vol_mute, + IC_AUDIO_VOL, + IC_AUDIO_VOL_MUTE, true), NotificationStream(AudioManager.STREAM_NOTIFICATION, R.string.volume_icon_description_notification, @@ -198,8 +201,8 @@ public class VolumePanel extends Handler { // for now, use media resources for master volume MasterStream(STREAM_MASTER, R.string.volume_icon_description_media, //FIXME should have its own description - R.drawable.ic_audio_vol, - R.drawable.ic_audio_vol_mute, + IC_AUDIO_VOL, + IC_AUDIO_VOL_MUTE, false), RemoteStream(STREAM_REMOTE_MUSIC, R.string.volume_icon_description_media, //FIXME should have its own description @@ -994,7 +997,7 @@ public class VolumePanel extends Handler { AudioManager.DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER)) != 0) { setMusicIcon(R.drawable.ic_audio_bt, R.drawable.ic_audio_bt_mute); } else { - setMusicIcon(R.drawable.ic_audio_vol, R.drawable.ic_audio_vol_mute); + setMusicIcon(IC_AUDIO_VOL, IC_AUDIO_VOL_MUTE); } break; } |