diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-05-21 16:24:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-21 16:24:02 +0000 |
| commit | 59845bef8e66c278c728744785852b8799d832fc (patch) | |
| tree | 295d8673498477b6c6d2bf3b389687351e53c0c5 /media | |
| parent | d6c3404f597b4ea12c56554ab509e227f9722a77 (diff) | |
| parent | 42697ffd42f90db1ccdd0a5bbd87f664aa38518f (diff) | |
| download | frameworks_base-59845bef8e66c278c728744785852b8799d832fc.zip frameworks_base-59845bef8e66c278c728744785852b8799d832fc.tar.gz frameworks_base-59845bef8e66c278c728744785852b8799d832fc.tar.bz2 | |
Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/RingtoneManager.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index e211b99..a1b8a3b 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -158,7 +158,16 @@ public class RingtoneManager { * in most cases. */ public static final String EXTRA_RINGTONE_TITLE = "android.intent.extra.ringtone.TITLE"; - + + /** + * @hide + * Given to the ringtone picker as an int. Additional AudioAttributes flags to use + * when playing the ringtone in the picker. + * @see #ACTION_RINGTONE_PICKER + */ + public static final String EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS = + "android.intent.extra.ringtone.AUDIO_ATTRIBUTES_FLAGS"; + /** * Returned from the ringtone picker as a {@link Uri}. * <p> @@ -221,7 +230,7 @@ public class RingtoneManager { private boolean mStopPreviousRingtone = true; private Ringtone mPreviousRingtone; - + /** * Constructs a RingtoneManager. This constructor is recommended as its * constructed instance manages cursor(s). @@ -283,7 +292,7 @@ public class RingtoneManager { return AudioManager.STREAM_RING; } } - + /** * Whether retrieving another {@link Ringtone} will stop playing the * previously retrieved {@link Ringtone}. |