summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | am fc178e38: Merge "Asynchronous handling of remote volume updates" into jb-devJean-Michel Trivi2012-06-202-8/+30
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'fc178e381d3db299901a96461122eb22a4ffb43e': Asynchronous handling of remote volume updates
| | * | Asynchronous handling of remote volume updatesJean-Michel Trivi2012-06-202-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remote playback information updates will be posted from the application thread, and sent to AudioService. Because they require locking the stack containing the remote playback information, the update should happen on AudioService's handler thread to avoid lock contention. Change-Id: Ie04898295e08c16dd8ab5985fd825301e9cf1981
* | | | am b92d2a13: am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into ↵Jean-Michel Trivi2012-06-205-26/+350
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-dev * commit 'b92d2a13c4ab34862968f47191d2713de3701757': Remote volume handling in MediaRouter
| * | | am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-devJean-Michel Trivi2012-06-205-26/+350
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '18ddb6ce6f3672a24a6f86ee4b28f5baa746bc20': Remote volume handling in MediaRouter
| | * | Remote volume handling in MediaRouterJean-Michel Trivi2012-06-195-26/+350
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend MediaRouter.UserRouteInfo to enable setting playback information, which includes volume. When the user route instance has a RemoteControlClient, forward any playback information to it. Enable specifying a callback to be notified of volume events on the route. Extend MediaRouter.RouteInfo to enable retrieving playback information. Update RemoteControlClient javadoc to reflect which parts of the API are not intended to be made public. Change-Id: I59d728eb61747af6c8c89d53f0faeb07940594c3
* | | am 586b8ee6: am 2f442304: Merge "Remote volume handling" into jb-devJean-Michel Trivi2012-06-194-33/+733
|\ \ \ | |/ / | | | | | | | | | * commit '586b8ee62e0245e3c88ce9db51e1c1c3b4f1fb2c': Remote volume handling
| * | am 2f442304: Merge "Remote volume handling" into jb-devJean-Michel Trivi2012-06-194-33/+733
| |\ \ | | |/ | | | | | | | | | * commit '2f4423043ffeaf232ec984be03743326f08cdc8a': Remote volume handling
| | * Merge "Remote volume handling" into jb-devJean-Michel Trivi2012-06-194-33/+733
| | |\
| | | * Remote volume handlingJean-Michel Trivi2012-06-184-33/+733
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend RemoteControlClient class to enable an applicaton to specify more information about how it's playing media, now covering usecases where media playback happens "remotely". This playback information can be used to set the volume and maximum volume used remotely. Declare a new intent and associated extras in Intent, ACTION_VOLUME_UPDATE, so an application can be notified that the volume it handles should be updated. It can then use the new RemoteControlClient.setPlaybackInformation() method to notify AudioService what the volume is. Extend AudioService to maintain playback information associated with the RemoteControlClient information in the stack of media button event receivers (mRCStack). The information about the active remote is cached so the stack doesn't have to be iterated over in order to retrieve remote playback info. Events to "adjust" the remote volume based on hardware key presses cause the client application to be notified of volume updates, and the volume panel to display the volume set by the app. Revise which stream type is controlled when none is specified according to latest guidelines for remote playback. Update VolumePanel class to support a new pseudo stream type, AudioService.STREAM_REMOTE_MUSIC, that corresponds to the remote playback volume, and uses the new "media route" icon. Enable it to receive asynchronously new volume values for the remote that will be displayed if the UI is still up, and ignored otherwise. Now supports hiding/showing sliders dynamically so remote volume only appears when AudioService has a remote control client handling remote volume. Define new java symbols for the two media route icons. Modify lockscreen behavior: don't automatically control music volume when music is active, consider also remote playback. Still to do: - playback information set by RemoteControlClient should post a message for AudioService to update playback information instead of updating it synchronously Change-Id: I557aa687239f9acfe33a609f05876c67fa7eb967
* | | | am 29a2f84f: am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into ↵Adam Powell2012-06-182-6/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-dev * commit '29a2f84fbee96c1bbbcb50eceb17d9b726854146': MediaRouter bluetooth a2dp selection
| * | | am 5bb835a9: Merge "MediaRouter bluetooth a2dp selection" into jb-devAdam Powell2012-06-182-6/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '5bb835a95942b0b313b2fa4e3f05941e630f9be7': MediaRouter bluetooth a2dp selection
| | * | MediaRouter bluetooth a2dp selectionAdam Powell2012-06-182-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove bluetooth permission check from internal AudioService method setBluetoothA2dpOn Manage BT A2DP state in MediaRouter. A2DP is only enabled or disabled when either the system built-in audio route or the A2DP audio route is selected; when selecting any other route the current state is left alone. Change-Id: Ib14274e206e79bd8762edca1205ecfa87b7a94cf
* | | | am 12c2fbd3: am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-devAdam Powell2012-06-181-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '12c2fbd3b7e98132fe1388b065a5dd09c20ef390': Restrict MediaRouter selection
| * | | am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-devAdam Powell2012-06-181-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'eb2c1b21c6835399fa55227e498fb2930e533439': Restrict MediaRouter selection
| | * | Restrict MediaRouter selectionAdam Powell2012-06-181-0/+1
| | |/ | | | | | | | | | | | | | | | | | | Actually restrict the programmatic selection of routes by type. (Oops.) Change-Id: I91e837f7ecbcddb626c664fb470e8296d563498d
* | | am c92aa2e7: am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into ↵Adam Powell2012-06-181-0/+17
|\ \ \ | |/ / | | | | | | | | | | | | | | | jb-dev * commit 'c92aa2e7c9112adafc5283921efe25574a95b7a4': Volume control in MediaRouter dialogs
| * | am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-devAdam Powell2012-06-181-0/+17
| |\ \ | | |/ | | | | | | | | | * commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505': Volume control in MediaRouter dialogs
| | * Volume control in MediaRouter dialogsAdam Powell2012-06-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaRouter dialogs now intercept the volume keys for altering the current volume. The status icon indicates if the slider/buttons are currently controlling the local device volume or a remote device's volume. Group volume for user routes is handled by using the RemoteControlClient supplied by the first route in the group. Change-Id: I40a0d054847ed5acce7a4c3b669487841b4dca15
* | | am 8f695c52: am 706a8699: Merge "Make MediaRouter UI more robust around ↵Adam Powell2012-06-181-22/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | route count changes" into jb-dev * commit '8f695c525f5baa623a8b951bd3a1fd2b5efd1ceb': Make MediaRouter UI more robust around route count changes
| * | am 706a8699: Merge "Make MediaRouter UI more robust around route count ↵Adam Powell2012-06-181-22/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | changes" into jb-dev * commit '706a8699008ce416a7fbd9a4215726fdb00ee803': Make MediaRouter UI more robust around route count changes
| | * Make MediaRouter UI more robust around route count changesAdam Powell2012-06-161-22/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the API around ActionProvider visibility overriding. Allow the application to notify whatever is hosting the ActionProvider that visibility has changed in a way that is friendly to alternate support library-style reimplementations of MenuItem. Allow MediaRouter.Callback implementations to add or remove themselves or other Callbacks during dispatch of callback events. Make MediaRouteActionProvider track the visibility of corresponding menu items more accurately. Change-Id: Ic7ddb6a87c3637904750d2661e4a9fa323b09ea0
* | | am bb20575f: am 130b4572: ActionProvider API updateAdam Powell2012-06-181-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'bb20575f85ada8ccdacefc53f0da7e00fdf12a16': ActionProvider API update
| * | am 130b4572: ActionProvider API updateAdam Powell2012-06-181-1/+1
| |\ \ | | |/ | | | | | | | | | * commit '130b4572d1f3df702e5b296a655d15a41f6d4c66': ActionProvider API update
| | * ActionProvider API updateAdam Powell2012-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ActionProvider#overridesItemVisibility and isVisible. These methods allow an ActionProvider to override the visibility of a MenuItem that it is bound to. If a MenuItem has been explicitly hidden by the application, it will not be visible. * Change MediaRouteActionProvider to not require a MediaRouter callback, to avoid extra lifecycle management headaches. Change-Id: I606fa98b3a6a3e60a953dd024274f9bf9c67acdd
* | | am acae5bd3: am 87959cdd: Merge "Add new callback for MediaRouter to found ↵Dianne Hackborn2012-06-186-83/+267
|\ \ \ | |/ / | | | | | | | | | | | | | | | out about device changes." into jb-dev * commit 'acae5bd34923a79115ad24687558a6ab2ce780ec': Add new callback for MediaRouter to found out about device changes.
| * | am 87959cdd: Merge "Add new callback for MediaRouter to found out about ↵Dianne Hackborn2012-06-186-83/+267
| |\ \ | | |/ | | | | | | | | | | | | | | | device changes." into jb-dev * commit '87959cdd8560e743956a71bb687799e94053e086': Add new callback for MediaRouter to found out about device changes.
| | * Merge "Add new callback for MediaRouter to found out about device changes." ↵Dianne Hackborn2012-06-156-83/+267
| | |\ | | | | | | | | | | | | into jb-dev
| | | * Add new callback for MediaRouter to found out about device changes.Dianne Hackborn2012-06-156-83/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioService now has an API to call to get the currently connected devices, and later reports of changes in connection state. The information includes the name of the bluetooth device if one is connected for display to the user, and states for all of the pluggable devices. No longer requires a Bluetooth permission to keep the routes updated. Change-Id: I81ca421c60592fbc1592477d59bf1c9d1b64954a
* | | | am 9686f24c: am c4f4b0f0: Merge "AudioManager: back to old ↵Eric Laurent2012-06-181-26/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | setBluetoothA2dpOn()" into jb-dev * commit '9686f24ce3d13446393a468fb3f52283bf2bc80d': AudioManager: back to old setBluetoothA2dpOn()
| * | | am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-devEric Laurent2012-06-181-26/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'c4f4b0f0a4905180314d1a681ddf5767ed1070ed': AudioManager: back to old setBluetoothA2dpOn()
| | * | Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-devEric Laurent2012-06-151-26/+9
| | |\ \ | | | |/ | | |/|
| | | * AudioManager: back to old setBluetoothA2dpOn()Eric Laurent2012-06-151-26/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Come back to old versions of setBluetoothA2dpOn() and isBluetoothA2dpOn(). MediaRouter will call methods on IAudioService directly. Change-Id: I18f0a3106bad78715ed11a6b7b4ec1d656cdae41
* | | | am 15635728: am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" ↵Adam Powell2012-06-151-25/+33
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '15635728a4ff00da6cc3d6468c02d39e5631f124': Update MediaRouteChooserDialog grouping UI
| * | | am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-devAdam Powell2012-06-151-25/+33
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '27db797e37ea16ea5db6eb3f6a32e0f116c1b824': Update MediaRouteChooserDialog grouping UI
| | * | Update MediaRouteChooserDialog grouping UIAdam Powell2012-06-151-25/+33
| | | | | | | | | | | | | | | | | | | | | | | | Move UserRouteInfo tag support to RouteInfo Change-Id: Ia753924f8613462d5f74736be93a8d748689eef1
* | | | am 13b5c194: am 90b9f84c: Merge "API updates for MediaRouter" into jb-devAdam Powell2012-06-141-21/+103
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2': API updates for MediaRouter
| * | | am 90b9f84c: Merge "API updates for MediaRouter" into jb-devAdam Powell2012-06-141-21/+103
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '90b9f84c43145c51180c7253cd3a3f59862c2611': API updates for MediaRouter
| | * | API updates for MediaRouterAdam Powell2012-06-141-21/+103
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Accept a Context when fetching the names of routes and categories. This lets string resources resolve at time of access with the correct configuration. The older versions remain available that will use the static resources from the application. (There are enough cases where applications will populate this from external data that requiring it each time even when it was not initialized from a resource doesn't seem reasonable.) * Remove the ability for apps to programmatically select non-user routes. * Make MediaRouter.Callback an abstract class instead of an interface. This will make further extensions easier to keep compatible in the future. Change-Id: If981c511dfbdfaf41ef0d1cfe4a377fc14bb5600
* | | am 0f03d771: am f9b7f9f5: Merge "Support route grouping in the MediaRouter ↵Adam Powell2012-06-141-10/+63
|\ \ \ | |/ / | | | | | | | | | | | | | | | dialog UI." into jb-dev * commit '0f03d771b29ff0fc6919a514c56128de9a5ecd5e': Support route grouping in the MediaRouter dialog UI.
| * | am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." ↵Adam Powell2012-06-141-10/+63
| |\ \ | | |/ | | | | | | | | | | | | | | | into jb-dev * commit 'f9b7f9f5080100043df3c8868bca4df84becf5a1': Support route grouping in the MediaRouter dialog UI.
| | * Merge "Support route grouping in the MediaRouter dialog UI." into jb-devAdam Powell2012-06-141-10/+63
| | |\
| | | * Support route grouping in the MediaRouter dialog UI.Adam Powell2012-06-131-10/+63
| | | | | | | | | | | | | | | | Change-Id: Idcae12cedfb7ca13950e7fa45441fba2029a9f68
* | | | am be4e1ea4: am 0a4cbc32: Merge "Add property to override backdropper effect ↵Ruei-sung Lin2012-06-141-2/+26
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | threshold." into jb-dev * commit 'be4e1ea4f1e8b032ae37e9eb4919e6339ed7dc2d': Add property to override backdropper effect threshold.
| * | | am 0a4cbc32: Merge "Add property to override backdropper effect threshold." ↵Ruei-sung Lin2012-06-131-2/+26
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into jb-dev * commit '0a4cbc3267c12fb4f5831ea70286b0664f90891a': Add property to override backdropper effect threshold.
| | * | Merge "Add property to override backdropper effect threshold." into jb-devRuei-sung Lin2012-06-131-2/+26
| | |\ \ | | | |/ | | |/|
| | | * Add property to override backdropper effect threshold.Eino-Ville Talvala2012-06-131-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, change the default background mean to be the first incoming frame. Bug: 6600585 Change-Id: I2181e75711d48d01f48e3fb1d604eb467f08fda4
* | | | am 6c143590: am 4b4a947b: Merge "MediaRouter dialog" into jb-devAdam Powell2012-06-141-0/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '6c14359074ff5a93695ed37083c9178a4ca2d1f1': MediaRouter dialog
| * | | am 4b4a947b: Merge "MediaRouter dialog" into jb-devAdam Powell2012-06-131-0/+24
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f': MediaRouter dialog
| | * | MediaRouter dialogAdam Powell2012-06-131-0/+24
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the dialog behavior for MediaRouteActionProvider/MediaRouteButton. Still TODO: * Switch audio icon based on source; speaker/bt/user * Rig up volume slider * Rig up item icons * Rig up group button for groupable categories * Make grouping work Change-Id: I3f992516b184d5ae940ddb7bbb7f94ff58914589
* | | am 05fee7bd: am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to ↵James Dong2012-06-122-0/+190
|\ \ \ | |/ / | | | | | | | | | | | | | | | libvideoeditor_jni.so" into jb-dev * commit '05fee7bddba9a00ed33392e78fddefbebf79b0b4': Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so