diff options
| author | John Spurlock <jspurlock@google.com> | 2014-07-24 18:10:48 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-07-25 11:27:51 -0400 |
| commit | 351346092acdfbfcc1d9ebf98d539d2a1196c5e8 (patch) | |
| tree | cac60a4a224053998b911033a3a8aac3f38ccec9 /core/java/android/preference | |
| parent | ed1391a9297db5e2a8671bbf2d83654ee5d28702 (diff) | |
| download | frameworks_base-351346092acdfbfcc1d9ebf98d539d2a1196c5e8.zip frameworks_base-351346092acdfbfcc1d9ebf98d539d2a1196c5e8.tar.gz frameworks_base-351346092acdfbfcc1d9ebf98d539d2a1196c5e8.tar.bz2 | |
Volume: Show safe media warning in settings.
If the safe media warning is enabled, make sure
we display it from the new inline slider preference in
Settings (without showing the volume dialog itself).
Also:
- Update the warning dialog to the new sysui theme.
- Separate the warning sentences with an additional line.
- Fix the auto-dismiss timeout.
- Add a system property to additionally enable the safe
media warning for testing
- Add more information to audio service dumpsys.
Bug:15434662
Change-Id: I95fec12c9049bbfdb7ebdf246160e4b12c0c5be3
Diffstat (limited to 'core/java/android/preference')
| -rw-r--r-- | core/java/android/preference/SeekBarVolumizer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/preference/SeekBarVolumizer.java b/core/java/android/preference/SeekBarVolumizer.java index d66fc0f..671f722 100644 --- a/core/java/android/preference/SeekBarVolumizer.java +++ b/core/java/android/preference/SeekBarVolumizer.java @@ -113,7 +113,8 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba public boolean handleMessage(Message msg) { switch (msg.what) { case MSG_SET_STREAM_VOLUME: - mAudioManager.setStreamVolume(mStreamType, mLastProgress, 0); + mAudioManager.setStreamVolume(mStreamType, mLastProgress, + AudioManager.FLAG_SHOW_UI_WARNINGS); break; case MSG_START_SAMPLE: onStartSample(); |