diff options
| author | John Spurlock <jspurlock@google.com> | 2014-07-19 22:52:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 19:20:15 +0000 |
| commit | a082e35d9428c1e542b7b2839d675d87303255ec (patch) | |
| tree | 2c7212b4277dbead0ef994ec9f21e1f2c70d9665 /packages | |
| parent | 1019719e46a0847a36fdada2fcd7bb32f0c25c2e (diff) | |
| parent | ab4ea76edebe7fbdfec4140d03b23060a96c6f8c (diff) | |
| download | frameworks_base-a082e35d9428c1e542b7b2839d675d87303255ec.zip frameworks_base-a082e35d9428c1e542b7b2839d675d87303255ec.tar.gz frameworks_base-a082e35d9428c1e542b7b2839d675d87303255ec.tar.bz2 | |
Merge "Volume: No sound effects on the ringer toggle." into lmp-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java index 4ada5ec..fc530d0 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java @@ -484,6 +484,7 @@ public class VolumePanel extends Handler { sc.icon.setImageResource(sc.iconRes); sc.icon.setClickable(isNotificationOrRing(streamType)); if (sc.icon.isClickable()) { + sc.icon.setSoundEffectsEnabled(false); sc.icon.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { |