drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,023 Commits 1 Branch 0 Tags
Commit Graph

6617 Commits

Author SHA1 Message Date
Adam Powell
7e8aac14c3 am bb20575f: am 130b4572: ActionProvider API update 
* commit 'bb20575f85ada8ccdacefc53f0da7e00fdf12a16':
  ActionProvider API update
 2012-06-18 10:49:41 -07:00
Dianne Hackborn
5ded10982c am acae5bd3: am 87959cdd: Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev 
* commit 'acae5bd34923a79115ad24687558a6ab2ce780ec':
  Add new callback for MediaRouter to found out about device changes.
 2012-06-18 10:49:15 -07:00
Eric Laurent
2c0044410e am 9686f24c: am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev 
* commit '9686f24ce3d13446393a468fb3f52283bf2bc80d':
  AudioManager: back to old setBluetoothA2dpOn()
 2012-06-18 10:49:12 -07:00
Adam Powell
c92aa2e7c9 am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev 
* commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505':
  Volume control in MediaRouter dialogs
 2012-06-18 10:34:32 -07:00
Adam Powell
8f695c525f am 706a8699: Merge "Make MediaRouter UI more robust around route count changes" into jb-dev 
* commit '706a8699008ce416a7fbd9a4215726fdb00ee803':
  Make MediaRouter UI more robust around route count changes
 2012-06-18 10:34:29 -07:00
Adam Powell
bb20575f85 am 130b4572: ActionProvider API update 
* commit '130b4572d1f3df702e5b296a655d15a41f6d4c66':
  ActionProvider API update
 2012-06-18 10:33:19 -07:00
Dianne Hackborn
acae5bd349 am 87959cdd: Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev 
* commit '87959cdd8560e743956a71bb687799e94053e086':
  Add new callback for MediaRouter to found out about device changes.
 2012-06-18 10:31:29 -07:00
Eric Laurent
9686f24ce3 am c4f4b0f0: Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev 
* commit 'c4f4b0f0a4905180314d1a681ddf5767ed1070ed':
  AudioManager: back to old setBluetoothA2dpOn()
 2012-06-18 10:31:22 -07:00
Adam Powell
4599696591 Volume control in MediaRouter dialogs 
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
 2012-06-16 17:21:57 -07:00
Adam Powell
39d5c61725 Make MediaRouter UI more robust around route count changes 
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
 2012-06-16 14:49:13 -07:00
Adam Powell
130b4572d1 ActionProvider API update 
* 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
 2012-06-15 20:19:29 -07:00
Dianne Hackborn
87959cdd85 Merge "Add new callback for MediaRouter to found out about device changes." into jb-dev 2012-06-15 14:10:42 -07:00
Eric Laurent
c4f4b0f0a4 Merge "AudioManager: back to old setBluetoothA2dpOn()" into jb-dev 2012-06-15 14:01:49 -07:00
Dianne Hackborn
632ca417f0 Add new callback for MediaRouter to found out about device changes. 
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
 2012-06-15 13:15:35 -07:00
Adam Powell
d1e57d7886 am 15635728: am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev 
* commit '15635728a4ff00da6cc3d6468c02d39e5631f124':
  Update MediaRouteChooserDialog grouping UI
 2012-06-15 11:57:26 -07:00
Adam Powell
15635728a4 am 27db797e: Merge "Update MediaRouteChooserDialog grouping UI" into jb-dev 
* commit '27db797e37ea16ea5db6eb3f6a32e0f116c1b824':
  Update MediaRouteChooserDialog grouping UI
 2012-06-15 11:54:42 -07:00
Eric Laurent
242b33870b AudioManager: back to old setBluetoothA2dpOn() 
Come back to old versions of setBluetoothA2dpOn() and isBluetoothA2dpOn().

MediaRouter will call methods on IAudioService directly.

Change-Id: I18f0a3106bad78715ed11a6b7b4ec1d656cdae41
 2012-06-15 11:48:50 -07:00
Adam Powell
b5e2af5919 Update MediaRouteChooserDialog grouping UI 
Move UserRouteInfo tag support to RouteInfo

Change-Id: Ia753924f8613462d5f74736be93a8d748689eef1
 2012-06-15 00:11:34 -07:00
Adam Powell
2f115bc007 am 13b5c194: am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev 
* commit '13b5c194e1ca2ed5ca9187e15ca0518b8bb052d2':
  API updates for MediaRouter
 2012-06-14 18:30:55 -07:00
Adam Powell
13b5c194e1 am 90b9f84c: Merge "API updates for MediaRouter" into jb-dev 
* commit '90b9f84c43145c51180c7253cd3a3f59862c2611':
  API updates for MediaRouter
 2012-06-14 17:58:05 -07:00
Adam Powell
0d03c042f9 API updates for MediaRouter 
* 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
 2012-06-14 16:16:31 -07:00
Adam Powell
a587b449c4 am 0f03d771: am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev 
* commit '0f03d771b29ff0fc6919a514c56128de9a5ecd5e':
  Support route grouping in the MediaRouter dialog UI.
 2012-06-14 11:34:17 -07:00
Adam Powell
0f03d771b2 am f9b7f9f5: Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev 
* commit 'f9b7f9f5080100043df3c8868bca4df84becf5a1':
  Support route grouping in the MediaRouter dialog UI.
 2012-06-14 11:28:37 -07:00
Adam Powell
f9b7f9f508 Merge "Support route grouping in the MediaRouter dialog UI." into jb-dev 2012-06-14 11:25:20 -07:00
Ruei-sung Lin
664020369d am be4e1ea4: am 0a4cbc32: Merge "Add property to override backdropper effect threshold." into jb-dev 
* commit 'be4e1ea4f1e8b032ae37e9eb4919e6339ed7dc2d':
  Add property to override backdropper effect threshold.
 2012-06-14 10:33:45 -07:00
Adam Powell
cf815b56bf am 6c143590: am 4b4a947b: Merge "MediaRouter dialog" into jb-dev 
* commit '6c14359074ff5a93695ed37083c9178a4ca2d1f1':
  MediaRouter dialog
 2012-06-14 10:32:49 -07:00
Ruei-sung Lin
be4e1ea4f1 am 0a4cbc32: Merge "Add property to override backdropper effect threshold." into jb-dev 
* commit '0a4cbc3267c12fb4f5831ea70286b0664f90891a':
  Add property to override backdropper effect threshold.
 2012-06-13 23:44:09 -07:00
Ruei-sung Lin
0a4cbc3267 Merge "Add property to override backdropper effect threshold." into jb-dev 2012-06-13 23:41:38 -07:00
Adam Powell
d6d0bddee3 Support route grouping in the MediaRouter dialog UI. 
Change-Id: Idcae12cedfb7ca13950e7fa45441fba2029a9f68
 2012-06-13 23:27:09 -07:00
Eino-Ville Talvala
4239373aed Add property to override backdropper effect threshold. 
Also, change the default background mean to be the first incoming frame.

Bug: 6600585
Change-Id: I2181e75711d48d01f48e3fb1d604eb467f08fda4
 2012-06-13 15:51:11 -07:00
Adam Powell
6c14359074 am 4b4a947b: Merge "MediaRouter dialog" into jb-dev 
* commit '4b4a947b5e4913d7f8b7df15d3a7cdf8f343471f':
  MediaRouter dialog
 2012-06-13 14:05:24 -07:00
Adam Powell
70e11e50ee MediaRouter dialog 
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
 2012-06-13 11:42:10 -07:00
James Dong
0b1d806188 am 05fee7bd: am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev 
* commit '05fee7bddba9a00ed33392e78fddefbebf79b0b4':
  Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so
 2012-06-12 14:53:10 -07:00
James Dong
05fee7bddb am 085c4825: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev 
* commit '085c4825897bbbfa0f8564c2de45f74d7bea4029':
  Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so
 2012-06-12 14:22:59 -07:00
James Dong
085c482589 Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so" into jb-dev 2012-06-12 14:20:31 -07:00
James Dong
c6693f6fee Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so 
Change-Id: Ibe37c2e6ede6143dc4e27c6072867bc58aa1c08a
related-to-bug: 6647465
 2012-06-12 14:05:14 -07:00
Adam Powell
49a0b01bdc am 0d637d6f: am 579ec308: Merge "MediaRouter work" into jb-dev 
* commit '0d637d6f888cdddba554174284fb96f8354a15e4':
  MediaRouter work
 2012-06-12 13:01:30 -07:00
Eric Laurent
16e7127948 am 2e1f18b9: am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev 
* commit '2e1f18b9ba9af40d5e1f0874e091b8f487a2d50d':
  Made IAudioService.setBluetoothA2dpOn() not oneway
 2012-06-12 13:01:24 -07:00
Adam Powell
ca415c8529 am 345a3835: am f958732b: Merge "Fix docs" into jb-dev 
* commit '345a3835aafd01e837741aa6ea733d8dc1b7dd2b':
  Fix docs
 2012-06-12 13:01:09 -07:00
Adam Powell
0c9c063179 am a20d99b1: am ae20ae1a: More MediaRouter features. 
* commit 'a20d99b17906cb371203be8ec4dc92d9a104f8dd':
  More MediaRouter features.
 2012-06-12 13:01:03 -07:00
Dianne Hackborn
d4a0c49ffa am 007f2b40: am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev 
* commit '007f2b40f952eab8951c6b22302a59a955a20561':
  Rework media router to be per-context with global process state.
 2012-06-12 13:00:47 -07:00
Adam Powell
ea99d9af2d am bee681a1: am fbce66cb: Merge "Further work on MediaRouter" into jb-dev 
* commit 'bee681a1d54062dc0833cc9a45aac7b20725c1bb':
  Further work on MediaRouter
 2012-06-12 13:00:33 -07:00
Adam Powell
0d637d6f88 am 579ec308: Merge "MediaRouter work" into jb-dev 
* commit '579ec3086c9ce3616735bc3cf63246f052973a7f':
  MediaRouter work
 2012-06-12 12:46:02 -07:00
Eric Laurent
2e1f18b9ba am dcf33b73: Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev 
* commit 'dcf33b73159fe864f80514919775598e797e37d2':
  Made IAudioService.setBluetoothA2dpOn() not oneway
 2012-06-12 12:45:43 -07:00
Adam Powell
345a3835aa am f958732b: Merge "Fix docs" into jb-dev 
* commit 'f958732bd3924205d9f8bda94f4f6e3bb4045b28':
  Fix docs
 2012-06-12 12:43:57 -07:00
Adam Powell
a20d99b179 am ae20ae1a: More MediaRouter features. 
* commit 'ae20ae1a8aaa013813c356ae1d9541ca7ff020ae':
  More MediaRouter features.
 2012-06-12 12:43:48 -07:00
Dianne Hackborn
007f2b40f9 am f9d80b6b: Merge "Rework media router to be per-context with global process state." into jb-dev 
* commit 'f9d80b6b940540b5d7be22ae310e047fcd2472a8':
  Rework media router to be per-context with global process state.
 2012-06-12 12:43:20 -07:00
Adam Powell
bee681a1d5 am fbce66cb: Merge "Further work on MediaRouter" into jb-dev 
* commit 'fbce66cb259cb63b43fda654db68152b8b4a2c2f':
  Further work on MediaRouter
 2012-06-12 12:42:48 -07:00
Adam Powell
579ec3086c Merge "MediaRouter work" into jb-dev 2012-06-12 12:04:24 -07:00
Adam Powell
b35c445f34 MediaRouter work 
Fix a bug where MediaRouter would crash on creation

Add click listener for app-supplied extended settings on the route
selection dialog.

Change-Id: I2991db1720b5c574148e250526984592f4dc3c44
 2012-06-12 11:26:39 -07:00