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

6594 Commits

Author SHA1 Message Date
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
Eric Laurent
dcf33b7315 Merge "Made IAudioService.setBluetoothA2dpOn() not oneway" into jb-dev 2012-06-12 11:10:33 -07:00
Adam Powell
71c69897ad Fix docs 
Change-Id: If0215c02abf419d14f28574b751c9dfc2f27bcbe
 2012-06-11 20:12:56 -07:00
Adam Powell
ae20ae1a8a More MediaRouter features. 
Add RemoteControlClient to user routes. This will allow the UI layered
on top to access info about the remote volume channel associated with
a user route.

Add icons for user routes and route groups.

Change-Id: I438aa60fc8c93f878ec7638897225738155f0746
 2012-06-11 19:28:48 -07:00
Eric Laurent
4ab22bb7d0 Made IAudioService.setBluetoothA2dpOn() not oneway 
IAudioService.setBluetoothA2dpOn() should not be one way as
IAudioService.isBluetoothA2dpOn() will return inconsistent results
if called just after.

Bug 6572651.

Change-Id: Ib03ae49e6c0041b1b37dcac9e198cd93a4794030
 2012-06-11 17:10:02 -07:00
Dianne Hackborn
b58b8f832d Rework media router to be per-context with global process state. 
Change-Id: Ic1cb6f13e691d22783bcdafae85b7c75aec0a66f
 2012-06-11 15:41:08 -07:00
Adam Powell
d0d2cda9d4 Further work on MediaRouter 
Remove volume control and tracking. This will be handled by extensions
to existing audio and media APIs for now.

Tweak/refine other aspects of the API. Pass the router to callbacks for
easier future-proofing. Add group/ungroup callback methods.

Change-Id: Ib69e76e5f46280a9002b545bcf4cbc7b839844ee
 2012-06-11 13:17:44 -07:00
Marco Nelissen
92f4c7bc49 Merge "Bypass emulated storage for metadata extraction" 2012-06-08 14:40:09 -07:00
Marco Nelissen
c861411d4b Bypass emulated storage for metadata extraction 
b/6543148

Change-Id: Ic65957870199a2592ebe53b32517166f96e48ef2
 2012-06-08 14:22:56 -07:00
Jean-Baptiste Queru
fa30e18083 am 0237d04b: am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension" 
* commit '0237d04b9564b9ef3e443091a4bce7dc5a2f1826':
  Added mpga as valid MediaFile extension
 2012-06-08 11:01:01 -07:00
Jean-Baptiste Queru
0237d04b95 am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension" 
* commit '644e43e06ffa5b493ca3682c24b8db606deed664':
  Added mpga as valid MediaFile extension
 2012-06-08 10:57:12 -07:00
Jean-Baptiste Queru
644e43e06f am 3e3d641c: Merge "Added mpga as valid MediaFile extension" 
* commit '3e3d641c612fc6bacd367be696ae6125009d18d3':
  Added mpga as valid MediaFile extension
 2012-06-08 10:53:40 -07:00
Keun young Park
7edef088e3 am 765d3d13: am fca9ff38: Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev 
* commit '765d3d13c93c0c8b3d6a46db656328d61682acdb':
  rename exif to exif_jni due to refactoring in external/jhead
 2012-06-07 17:21:46 -07:00
Jean-Michel Trivi
bc35b34a7c am dbb9e386: am 6a5f9f6d: Merge "Configuration for lock and UI sound levels" into jb-dev 
* commit 'dbb9e38673bd133fa61a10d874ca325d23f3b5e3':
  Configuration for lock and UI sound levels
 2012-06-07 17:21:27 -07:00
Keun young Park
fca9ff3871 Merge "rename exif to exif_jni due to refactoring in external/jhead" into jb-dev 2012-06-07 16:19:02 -07:00
Jean-Michel Trivi
6a5f9f6ddb Merge "Configuration for lock and UI sound levels" into jb-dev 2012-06-07 15:28:51 -07:00
Keun young Park
bb52c49c9a rename exif to exif_jni due to refactoring in external/jhead 
- also pull libexif_jni from media_jni

Bug: 6623618
Change-Id: I4f06a4614c5fddcf98d95caff16a2c40f345dade
 2012-06-07 10:36:41 -07:00
Marco Nelissen
a061ef6c5f am f9800a01: am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev 
* commit 'f9800a01fe3690bac64bff0ba734a39f8a7f8ada':
  Ensure we compute display name when needed
 2012-06-06 15:51:19 -07:00
Marco Nelissen
81e85bbf67 Ensure we compute display name when needed 
Since the media scanner no longer uses an in memory cache, it always
found an entry for files inserted via MTP, which made it follow a
different code path than before, which in turn made the media
provider skip computing the display name column.
By clearing the row id in the media scanner when handling an mtp
request, we steer it back to the correct code path.
b/6297105
b/6525450

Change-Id: I624522b176a0057d246ce3040598af255b00a141
 2012-06-06 13:59:24 -07:00
Jean-Michel Trivi
bab1ae4ce6 am b8da1c90: am 88a89b29: Merge "Always queue A2DP connection state message with wakelock held" into jb-dev 
* commit 'b8da1c90c42ffb15b967915986ec2f59d40d3185':
  Always queue A2DP connection state message with wakelock held
 2012-06-06 13:37:54 -07:00
Jean-Michel Trivi
e12c39bb9c Always queue A2DP connection state message with wakelock held 
Messages for changes to A2DP connection state are intended to be
 queued in AudioService after acquiring a wake lock, which is
 released after the message has been handled.
This was correctly done for connection messages when the system
 is up and running, but wasn't when the BluetoothProfile service
 listener gets an onServiceConnected() event, which is the case
 the the device boots.
This change correctly uses the queueMsgUnderWakeLock() method
 whenever a MSG_SET_A2DP_CONNECTION_STATE is to be sent.

Bug 6616292

Change-Id: Ie337a4641a89c522e2d233bccaac4e08ce324117
 2012-06-06 11:33:48 -07:00
Adam Powell
b85afc25d5 resolved conflicts for merge of 1178569b to master 
Change-Id: If2bb6ccaee99bcf199cd93f24eba217fe6ff485e
 2012-06-05 20:08:41 -07:00
Adam Powell
690ffb4e1f More fun with MediaRouter 
Add action provider, button, and styles. Extend ActionProvider to
allow for getting references to MenuItem instances.

Implement toggle mode for the MediaRouteButton/ActionProvider. Dialog
selection yet to come.

Change-Id: Ibe3188570f503bbf8dd00cf154663435656a7171
 2012-06-05 19:15:57 -07:00
Jean-Michel Trivi
c55b393efd Configuration for lock and UI sound levels 
Define two integers in the platform configuration to
 define the sound level for lock/unlock sounds, and
 UI sound effects.
Use the corresponding value in KeyguardViewMediator for the lock sounds.
Use the corresponding value in AudioService when playing sound effects.

Bug 6448481

Change-Id: Ie238f5eb1645e395412864d93447ac4049f7e54b
 2012-06-05 16:58:20 -07:00