History log of /packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
b1cfcbc651cf82ba288a1791c22b8fe5ef9dbeb3 09-May-2017 Christine Franks <christyfranks@google.com> Allow ogg files to be selected as ringtones

Bug: 37891455
Test: manual - open custom phone ringtone picker in settings, navigate
to an .ogg file, and it should be selectable; select it and it should
add itself to the list of available ringtones, and play its sample
correctly.

Change-Id: Idf91066a6405464945f2b2c2bcae921cb7f99cd4
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
02b065cd0ed27e5130489502941ecd5bcd73b5c9 11-Apr-2017 Tony Mak <tonymak@google.com> Follow-up: Show RingtonePickerActivity in work user instead

Due to the fact that the activity is now running in the target user,
remove special user handling codes.

Bug: 37197930

Test: Try to import custom ringtone in work profile, no crash observed
Set the custom one as default is also working.

Change-Id: I994df3163c505abc18725cc36cc33a7e30faa577
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
4850d9c0e4caf10203153af0120f30f7aae3161e 24-Mar-2017 Robin Lee <rgl@google.com> Remove OnCreateContextMenuListener implementation

Change-Id: I3d4c220c35a2fe869c485b85f62369dd130b24fd
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
faa2ec640a0f113e45b8b661352313e28db49b86 24-Mar-2017 Robin Lee <rgl@google.com> Disable 'delete' context menu :(

Change-Id: Idd00a3458c6b9777214717a6f557e76f3c0878c5
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
fd7ca5eb7dc1fc653e08a70b816143034b8777aa 07-Mar-2017 Robin Lee <rgl@google.com> Create adapter before restoring saved state.

Change-Id: I323314370b8757ede0e05541a98a6cdb8affa0ee
Fix: 36017194
Test: adb shell am start -n com.android.providers.media/.RingtonePickerActivity # with "don't keep activities" enabled
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
e096e2633f7e8a6bada6cd7548b359a29ef2bc4e 09-Jan-2017 Robin Lee <rgl@google.com> Use stable item ID instead of URI for checkedItem

This is faster, more correct, and also harder to get wrong. And it was
wrong, there were quite common situations where the previous code
threw CursorIndexOutOfBoundsException because getRingtonePosition()
called getItemId() which called... getRingtonePosition() again.

CC Bug: 30658854
Test: monkeytest: crashed this before; now we are crash-free.

Change-Id: I68c06f2123fb84c15d4bbadec7be61c5cdfd1da7
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
8bc24f5d220ce6c54b70aa8f6192cae1d33fa2e9 30-Sep-2016 Andre Lago <andrelago@google.com> [RingtonePicker] Add and delete custom ringtones

Added UI items to add and delete custom ringtones, using the new
RingtoneManager API for it.

Test: manual - add and remove ringtones, check if they get played
Bug: 30658854
Change-Id: Ie8d51ffd9bebda625563017978e41cfdffbfee7a
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
c50825ed98ca93a58256323de01ca2b9b26f9470 25-Aug-2016 Andre Lago <andrelago@google.com> [RingtonePicker] Get cursor to list parent sounds

Since it is now possible for the work profile to use ringtones from the
personal profile, even custom ringtones, then it makes sense for the
RingtonePicker to list them as well.

This changes use a new RingtoneManager API to also include the personal
ringtones in the work profile RingtonePicker, also displaying a small
work badge next to the custom ringtones of the work profile.

Test: manual - install custom ringtone in work profile and see if it shows with a work badge in the picker
Bug: 30658854
Change-Id: I76e46e7d9401d54e8f096b80ea79e643ce2ab37e
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
97e693ab5a01883dc45653d0b1622a5775b0c27e 05-Dec-2016 Joshua Trask <joshtrask@google.com> Set the activity result for the watch's RingtonePickerActivity. am: 385f237168 am: 3fcd20a981
am: 47a07c1595

Change-Id: I3402f3aff41de0bfc1bfc1849b946e706e002b3f
385f2371687760c040e734840ef57de5d7451e8d 02-Dec-2016 Joshua Trask <joshtrask@google.com> Set the activity result for the watch's RingtonePickerActivity.

On the watch, this activity gets a "buttonless" UI treatment, instead
of the usual two-button (save/cancel) UI. In the buttonless UI, the
current selection is saved as soon as the activity exits (only "cancelling"
if the user selected either nothing, or the same value that was already
saved).

In the initial buttonless implementation, that selection was saved in the
onBackButtonPressed hook. The Wear platform just switched to a
press-to-go-home convention, so the activity won't actually receive the
onBackButtonPressed event in time.

The current CL makes sure that the user's selection is saved automatically
in the buttonless treatment, so it's always ready regardless of how the
selection activity exited.

Change-Id: I6b76ff8e07270eb51191a1bbe2f5aa1107b6f2e0
BUG:33117412
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
f660484d55315c2429149ea9a6329b1d0f52e8c5 16-Nov-2016 Sean Stout <sstout@google.com> Set ringtone picker title depending on type.

Test: adb shell am start -a android.intent.action.RINGTONE_PICKER --ei
android.intent.extra.ringtone.TYPE 4
Bug: 32645011
Change-Id: Ia8e90f539c356c6d687491e7c0ceb3339695ae10
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
7da6ecb99a8b9b510d73bfbd37f3d2dfb43a9178 12-Oct-2016 Michael Kwan <mkwan@google.com> resolve merge conflicts of 70b4024 to master

Change-Id: Ic624e2cce17f9c8e19014e82f90af83a9eec9ac8
f1c53f21f8da9abbd0c83fb941cfcbd7a7801671 12-Oct-2016 Michael Kwan <mkwan@google.com> Add buttonless UI for watch type devices.

Watch type devices defaults to using an interaction model that
avoids the use of buttons in AlertDialogs. A buttonless
mode was added and enabled for watch devices to conform
with the behaviour of other similar dialogs.

Test: manual using watch system settings

Bug: 30946435
Change-Id: Iaee39ac373bc5c1ec669cdaea025a56360725f28
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
27b6cb8f903eeb857d1119aee5b6914e9e651b84 02-Sep-2016 TreeHugger Robot <treehugger-gerrit@google.com> Merge "Remove cursor deactivation from RingtonePicker"
4af48024e62f567800f6b5af220b76d6651584c8 02-Sep-2016 Robin Lee <rgl@google.com> Remove cursor deactivation from RingtonePicker

This breaks resuming with the same cursor after onStop has deactivated
it, which blanks out all of the options except 'None'.

We probably shouldn't do that.

(regression from I12268cce0c12f5a73b3942d834757f1a8732d03e)

Bug: 30658854
Change-Id: If83ab6bf2066132e9fd48e7a0c1aab0d11fb2e75
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
0949b2b14efc86e8095a29b3761b7bd24baf9159 25-Aug-2016 Ray Essick <essick@google.com> Handle picker defaults for notification and alarm

When determining the URI for the default choice in ringtone picker,
wait until we parse whether we're picking for ringtone, notification,
or alarm. Use this knowledge instead of always filling in with value
for ringtone.

Bug: 30551658
Tests: ran bug-supplied POC: selects default, plays response from picker
Change-Id: Ic31eacfbea61dfe229a48c219f2871501aeb121c
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
8fb4b65550a55c6f608e74d9a90bb8de263a4270 27-Jul-2016 Andre Lago <andrelago@google.com> Changed ringtone picker to allow specifying user

RingtonePickerActivity now reads a new extra specified in
RingtoneManager which allows to specify which user's ringtones should
be listed

Bug: 30658854
Change-Id: I12268cce0c12f5a73b3942d834757f1a8732d03e
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
df9be64635a0c92f0c03437e9be6d64a1961149f 02-Aug-2016 Ray Essick <essick@google.com> Handle picker defaults for notification and alarm

when determining the URI for the default choice in ringtone picker, wait
until we parse whether we're picking for ringtone, notification, or alarm.
Use this knowledge instead of always filling in with value for ringtone.

Bug: 30551658
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
03d697eebe32416a32a36b14d65dc2a2599992d9 29-Apr-2016 Jean-Michel Trivi <jmtrivi@google.com> Add support for localization of sound names in RingtonePicker

Add a cursor wrapper for queries on the names of sounds.
When the string is queried for the title column, build a resource
name from the value in the database, and check if a (potentially
localized) resource is found. Return that one if available,
return the default value if not found.

Bug 28347978

Change-Id: Ic1e3bb25acf3fccb18074d40c2fc8bdc42b5c769
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
4f8fbf745efada096681c387c1e9e600727dfd51 20-Apr-2016 Robert Carr <racarr@google.com> RingtonePickerActivity: Keep cursor open while visible.

If we clear the cursor before we are actually invisible we
may do so during or right before the exit animation
and see weird results (in this case a copy of the dialog
which contains no ringtones).

Bug: 26972412
Change-Id: I48b2f4ca5a677085c718f6c7866b3b6d1ca03689
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
8f8174a58d2d8819ddd2aa68cb754712ecc1e7a5 21-May-2015 Jean-Michel Trivi <jmtrivi@google.com> Add support for AudioAttributes flags in RingtonePickerActivity

Read EXTRA_RINGTONE_AUDIO_ATTRIBUTES_FLAGS from intent to change
the AudioAttributes flags on the Ringtone instance used to play
the selected ringtone.

Bug 19407114

Change-Id: I2d923ef27e8db19b2560a129ba2462c90a07a997
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
5ecb5a82857217edc17181210a980a705a12f02d 05-Sep-2014 Hyejin Kim <hyejin.kim@lge.com> Revert "RingtonePicker: use a non-intercepted stream for playback."

This reverts commit c50b2befee37f28f9b482b0a31a62329142e4a6a.

When user set alarm ringtone in DeskClock,
It can't play with AudioManager.STREAM_SYSTEM stream type

Bug: 16906307
Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
b83e386bda1b7b5d456ac93f71817d343145b99d 12-Aug-2014 Adam Powell <adamp@google.com> Use material alert dialog item view layout

Bug 16552638

Change-Id: If32429d6c124970b22075930a60fa23cafed8395
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
c50b2befee37f28f9b482b0a31a62329142e4a6a 20-Jul-2014 John Spurlock <jspurlock@google.com> RingtonePicker: use a non-intercepted stream for playback.

When choosing a ringtone, avoid the ringer stream during
playback to avoid interception.

As before, no playback is performed if muted.

Bug:15344396
Change-Id: I7301c7e60682c57187708dfc8fa933a150c5147a
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
84b52307d1f80ebc53453718b9c58c9ea6c463fe 04-Jun-2013 Marco Nelissen <marcone@google.com> am 3fba2ebb: am 89074d55: Merge "Change titile from Ringtone to Notification sound"

* commit '3fba2ebb0e372f46cc9bb6cbb0b53b8477eaada9':
Change titile from Ringtone to Notification sound
80d534abc5f19510f008b13a0c32e0b89bb41fb5 08-Apr-2013 Hyejin Kim <hyejin.kim@lge.com> Change titile from Ringtone to Notification sound

- check the ringtone type
- according to sound type, select the title

Change-Id: I5708bccb79733cb9720911270b5060d21a5fc1e2
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
f73b7fdf062b7441c486da9bb79514996fd7000b 31-May-2013 Jeff Sharkey <jsharkey@android.com> am 70fe36d3: am cab96709: Merge "Revert "Change titile from Ringtone to Notification sound""

* commit '70fe36d35f6fee4c8e0c4711a4bee6f34e37072c':
Revert "Change titile from Ringtone to Notification sound"
68d20066188af9bf8d893f2252f95d74d7ba56c1 31-May-2013 Jeff Sharkey <jsharkey@android.com> am 1f6bee07: am 10af2d0a: Merge "Change titile from Ringtone to Notification sound"

* commit '1f6bee072edfe440f91341c361a47b5825e99283':
Change titile from Ringtone to Notification sound
b772152f9d730000ca405f9e5b0c7bc4afb0e0a7 30-May-2013 Jeff Sharkey <jsharkey@android.com> Revert "Change titile from Ringtone to Notification sound"

This reverts commit b04237109762ba9b407312d8e3949cdca6ead81f

Change-Id: I3a490bbc950638eb56f1ea4a368e116f97324c5b
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
f8c969610f2c44244ce1f619b260286566ba12cd 30-May-2013 Amith Yamasani <yamasani@google.com> Don't override clicked pos on orientation change

Bug: 6646056 Please preserve selected ringtone type
Change-Id: I59aee95de5435bc47ef26bc5626f98439aef67e2
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
61434adc0d321e414e4ebd215d7150b5e579cd2c 29-May-2013 Amith Yamasani <yamasani@google.com> Don't stop playing ringtone if device is rotating.

Bug: 9114933
Change-Id: Iefe59302b90bbefca23c3e8530c49f00b7f9c3cb
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
144adc73684990bd1aa68824c64facc30d75260b 30-Apr-2013 Mike Lockwood <lockwood@google.com> Remove obsolete OMA-DRM support

Change-Id: Ief3d3b9037bb7751185f0b53dd67f182e8c62dc7
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
b04237109762ba9b407312d8e3949cdca6ead81f 08-Apr-2013 Hyejin Kim <hyejin.kim@lge.com> Change titile from Ringtone to Notification sound

- check the ringtone type
- according to sound type, select the title

Change-Id: I3c0962565aff41fa6add5c2ca55bbff42ddf326b
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
f71889145e1b13ebdaadd1ee09ae078a02304097 08-Feb-2013 Hiroaki Kuriyama <hiroaki.kuriyama@sonymobile.com> Default ringtone cannot be previewed as alarm stream type.

When choosing a ringtone for alarm use by "Android System"
ringtone picker (RingtonePickerActivity), default ringtone is
not played for preview with volume of alarm stream type but
with that of normal stream type.

It is because stream type is not reflected on mDefaultRingtone
instance of RingtonePickerActivity.

Change-Id: Idc71c9b620e40e4109604b2337677134bb74a8cd
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java
de2f00f28e0ddf0a1495c0696ba84ea6aa3016c4 18-Apr-2012 Jeff Sharkey <jsharkey@android.com> Move RINGTONE_PICKER to handle external storage.

To give RINGTONE_PICKER external storage access, move it from system
to MediaProvider.

Bug: 6346701
Change-Id: Ib5f8e8fa8a962be211bc60c6e09778c7e2b85f2a
/packages/providers/MediaProvider/src/com/android/providers/media/RingtonePickerActivity.java