diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:22:30 +0200 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:22:30 +0200 |
commit | a0ce80942766948d4cd1036b97e2ee721ed8ecce (patch) | |
tree | 5d596eea5771aa9f494d2b1fcf6b3b44da2d401c /packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java | |
parent | a3f7b1e4871de0b508bbefb0236d258d47a38f15 (diff) | |
parent | 0e4f9e2f03e376f0816c1e653bf97fe1d0176794 (diff) | |
download | frameworks_base-a0ce80942766948d4cd1036b97e2ee721ed8ecce.zip frameworks_base-a0ce80942766948d4cd1036b97e2ee721ed8ecce.tar.gz frameworks_base-a0ce80942766948d4cd1036b97e2ee721ed8ecce.tar.bz2 |
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_base into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java | 13 |
1 files changed, 10 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 9fda531..555c2d1 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java @@ -192,8 +192,13 @@ public class VolumeDialog { } }); - addRow(AudioManager.STREAM_RING, - R.drawable.ic_volume_ringer, R.drawable.ic_volume_ringer_mute, true); + if (Util.isVoiceCapable(mContext)) { + addRow(AudioManager.STREAM_RING, + R.drawable.ic_volume_ringer, R.drawable.ic_volume_ringer_mute, true); + } else { + addRow(AudioManager.STREAM_RING, R.drawable.ic_volume_notification, + R.drawable.ic_volume_notification_mute, true); + } addRow(AudioManager.STREAM_MUSIC, R.drawable.ic_volume_media, R.drawable.ic_volume_media_mute, true); addRow(AudioManager.STREAM_ALARM, @@ -635,7 +640,9 @@ public class VolumeDialog { } } - updateNotificationRowH(); + if (Util.isVoiceCapable(mContext)) { + updateNotificationRowH(); + } if (mActiveStream != state.activeStream) { mActiveStream = state.activeStream; |