summaryrefslogtreecommitdiffstats
path: root/tests/OneMedia
Commit message (Collapse)AuthorAgeFilesLines
* Remove incomplete media router API.Jeff Brown2015-05-065-412/+0
| | | | | | | | This time not also accidentally deleting frameworks/base/Android.mk. *sigh* Bug: 20641986 Change-Id: I2e43ab1fdf4201fec4d5a5b73c04f27a4a848630
* Revert "Remove incomplete media router API."Bart Sears2015-05-075-0/+412
| | | | | | | | | This CL has broken all builds on mnc-dev. Reverting until Jeff can take a look at it. This reverts commit 2e5a2051de54e64612e1357d4534c7ec851aa508. Change-Id: Ib9b3569bfebdc7bbfbcb7aee82733b93736c5bb5
* Remove incomplete media router API.Jeff Brown2015-05-065-412/+0
| | | | | Bug: 20641986 Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
* Move apache specific portions of android.net.http to external/apache-http.Narayan Kamath2015-02-122-0/+4
| | | | | | | | | | | | | | | | | | | We continue to compile external/apache-http into ext.jar. This contains a few changes apart fom the classes moving around : - Makefile changes to build docs and api-stubs for now. A future change will revert these changes and remove these classes from stubs and docs. - Hardcode event IDs in legacyerrorstrings to avoid a dependency between the frameworks and apache. These strings are on their way out and will never change anyway. - Remove imports due to {@link} tags and use {@code} instead. - Remove an accidental(?) dependency on apache commons code that's a part of apache-http. bug: 18027885 Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf
* am 00cbb751: am 5e8f023d: am a59c7f03: am dff59b8b: am 23df1c46: Merge ↵RoboErik2014-09-261-0/+12
|\ | | | | | | | | | | | | "Allow null queues to be set in MediaSession" into lmp-dev * commit '00cbb751533bf683480ba80f0c450c59c6ca96a1': Allow null queues to be set in MediaSession
| * Allow null queues to be set in MediaSessionRoboErik2014-09-241-0/+12
| | | | | | | | | | | | | | Also add some test code for it to OneMedia. bug:17593962 Change-Id: I074e2bb0329d9a97f623e4309bb7dada157b8324
* | am 8fe00fb8: am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to ↵RoboErik2014-09-052-4/+4
|\ \ | |/ | | | | | | | | | | register/unregisterCallback" into lmp-dev * commit '8fe00fb8658c49a4bfd6e5bb4665d91f3879fcf6': rename add/removeCallback to register/unregisterCallback
| * rename add/removeCallback to register/unregisterCallbackRoboErik2014-09-052-4/+4
| | | | | | | | | | bug:17390821 Change-Id: Id610b481083686dba2a28b6c7c47b747f89eef4f
* | am ab716047: am 86e941e6: am a70def9e: Merge "Update to MediaBrowser APIs ↵RoboErik2014-08-281-2/+3
|\ \ | |/ | | | | | | | | | | per council feedback" into lmp-dev * commit 'ab71604780c4cccf238e1c78b7b05310c4a49583': Update to MediaBrowser APIs per council feedback
| * Update to MediaBrowser APIs per council feedbackRoboErik2014-08-281-2/+3
| | | | | | | | | | | | | | | | Does all the updates in the bug except the loadIcon/loadBitmap methods, which are removed per feedback from Sharkey. bug:17205016 Change-Id: Ie84d4d25a59c6985ce16972c26c8d1e5c02ff5c9
| * Remove incomplete media router API. (DO NOT MERGE)Jeff Brown2014-08-195-412/+0
|/ | | | Change-Id: I310fadafb5a6b8190a32e5d87f3e1823c87bcef7
* Add metadata and notifications to OneMediaDaniel Sandler2014-08-1417-11/+568
| | | | | | | This wires up a notification and some basic metadata for testing in OneMedia. Change-Id: I0f2e922536c85caa63f66dae7deb55ffe94fe231
* Combine MediaSession Callback and TransportControlsCallbackRoboErik2014-08-071-24/+4
| | | | | | | | This combines them into a single Callback class and adds default handling to media buttons to check the available actions and call one of the other methods if appropriate. Change-Id: If9897d8cf6d8d8046aa85a646c22382f1db1461b
* Add display metadata and change strings to CharSequencesRoboErik2014-08-051-2/+1
| | | | | | | | | This adds some fields for display purposes to MediaMetadata and also makes the default for all text CharSequence instead of String. Also adds a hidden method for getting a Description for the metadata. bug: 11708293 Change-Id: I0ed58d9ac3aeff41325c4ccf5fed0539bbf03b4d
* Fix checkbuildRoboErik2014-07-291-1/+1
| | | | Change-Id: I66321c6da4f921cee2db6f9f05312a6a8edc66d3
* Make MediaSession and MediaController constructors publicRoboErik2014-07-162-2/+3
| | | | | | | | | | This makes the MediaSession/Controller constructors public and registers with the system behind the scenes. This also adds a bit about needing to call setActive(true) to start receiving commands in MediaSession's docs. Change-Id: If882d229b54c36bf0831aca0255052dda667a2bc
* Make PlaybackState immutable with a builderRoboErik2014-07-142-32/+55
| | | | | bug:15862252 Change-Id: I51f2e466bd2c41bbe80d20aa9785126a7ac6ab3f
* Add API to set a default session in ActivityRoboErik2014-07-141-3/+9
| | | | | | | | | | We may have multiple remote sessions at once so an app needs a way to specify a default session to route media and volume commands to when its activity is in the foreground. This adds an api that works in parallel with the default stream api on Activity. bug:15727927 Change-Id: I5b67cb3e20647f9437d90aa65be63efe8c7865cf
* Update media session test application for new media router.Jeff Brown2014-07-149-151/+227
| | | | Change-Id: I3c19e008d211099b4d7320e3f195850cfb4dd927
* Revert "Make PlaybackState immutable with a builder"Erik Pasternak2014-07-102-53/+32
| | | | | | | | Will resubmit tomorrow for Build Breakage Friday as this change needs new SDK prebuilts for unbundled app branches. This reverts commit aa746b27610680a2c0fbdf7d81a6455c4597f05e. Change-Id: I28ba7e1b09234a5eb1b725aed043b9de98e1bc16
* Make PlaybackState immutable with a builderRoboErik2014-07-102-32/+53
| | | | | bug:15862252 Change-Id: I8944b7753cd6a36a74b0091f71a386f77040c4ab
* Make MediaSessionToken an inner class of MediaSession.Jeff Brown2014-06-304-10/+9
| | | | | | | Also add some missing AIDLs to the framework makefile to ensure they are included in the SDK. Change-Id: If85a3091c7591e0b3bbe6cc4bb74aba2284b4f42
* Minimum work to make volume handling work with sessionsRoboErik2014-05-301-2/+2
| | | | | | | | | | | | This is the minimum change to make adjusting volume work with MediaSessions. This only affects adjusting the volume and adjusting the volume with a suggested stream. Adjusting a specific stream or setting a specific stream will still use the same code. This does not fix existing remote volume handling in RCC, which will require a separate change to MediaController. Change-Id: I5b957ff4bece1ee11e2364e1f216e1c08343c983
* Refactor transport controls APIsRoboErik2014-05-302-20/+10
| | | | | | | | | | This merges TransportPerformer into MediaSession + a TransportControlsCallback and makes TransportController into an inner class on MediaController called TransportControls. Also makes the PlaybackState and Metadata part of the session APIs instead of transport controls. Change-Id: I16ad392e6d318abe3119ad5d89656d253af25e16
* API changes to sessionsRoboErik2014-05-294-36/+36
| | | | | | | Changes requested by API Council review. A second CL will refactor TransportController and TransportPerformer based on feedback. Change-Id: Ie26a7d01d7021232a66c2edf1eb58120437fdfde
* Rename session classes to have media prefix, hide routesRoboErik2014-05-166-24/+24
| | | | | | | This renames several of the core session classes to be prefixed with Media. It also adds @hide to all route references for now. Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
* Add a class for managing Session priorityRoboErik2014-05-061-2/+3
| | | | | | | | | | | | | | | | | | Priority is given first to the system priorty session, then to active local sessions, then to active remote sessions, then to the rest of the sessions. Ordering within categories is by whoever last performed an action we associate with the user. The stack has methods for getting filtered sets of this priority. This also: -Changes publish to setActive(boolean) -Adds a flag for handling media buttons. -Adds a flag for transport controls instead of enabling once. -Unhides the setFlags API. -Updates the legacy helper to use the flags. Change-Id: I6ebeb27410de1b24149fd6e1785613ac444f0774
* Add Session API calls to RCC and AudioManagerRoboErik2014-05-012-24/+28
| | | | | This makes RCC and MediaButtonReceiver (via AudioManager) also use the new Session APIs in parallel to their existing code. This will allow us to bring up the Session compatibility pieces without disrupting the old behavior and then switch everything over to just using the new APIs when ready. Change-Id: I33ce0a044dea3ec763f2302b91a5e415be27d4a4
* Add RouteProviders to the new Media APIsRoboErik2014-04-1717-60/+481
| | | | | | | | | | Compiles and works with OneMedia. This currently is a rough test of the system for finding, connecting to, and sending messages to routes. This will just connect to the first route it finds when a request to open the route picker is made (and disconnect when another request is made). Change-Id: I5de5521a079471b9e02664be4654c0591dfd9a6d
* Adds a TransportController and TransportPerformer to sessionRoboErik2014-03-126-50/+286
| | | | | | | | | This makes transport controls a primitive interface on sessions with a way to create the performer, register callbacks, and send commands and updates between controllers and performers. This still needs some cleanup but has been tested with OneMedia. Change-Id: I373d35f7ccc383b8421bd14044457467d80425f3
* Move Session apis to android.media.sessionRoboErik2014-02-255-11/+11
| | | | | | | This is to make it easier to distinguish the new apis from the old ones. Change-Id: Ic5eaf65e8bd054a844f87b9118c4bb18f30ac8a7
* Initial commit for MediaSession test appRoboErik2014-02-1927-0/+1893
This app creates a service and UI in separate processes and uses the new MediaSession APIs. This is still a rough work in progress. Change-Id: I9692c95bf2fdbee7255da86dff59044c893e3a1f