Commit Graph

17906 Commits

Author SHA1 Message Date
Mike Lockwood
3f5ba9feb7 Merge "MTP: Use media provider database to implement MTP device support." 2010-07-08 14:29:59 -07:00
Vasu Nori
213f7eaa89 Merge "reduce java locking on SQLiteDatabase if sql is already compiled" 2010-07-08 14:10:16 -07:00
Mike Lockwood
fced0db9c4 Merge "MTP: remove separate audio table from prototype MTP database" 2010-07-08 13:09:17 -07:00
Romain Guy
68e95188ed Merge "Do not draw the fade areas when it's not necessary." 2010-07-08 12:54:25 -07:00
Romain Guy
ca214ffc56 Merge "Create FBOs in LayerCache." 2010-07-08 11:48:34 -07:00
Vasu Nori
e084eea915 Merge "STOPSHIP CL in master - make sqlite WAL default for all apps" 2010-07-08 11:43:24 -07:00
Dan Tasse
f8e79d7f44 am 7017e0d5: am f3f25bf8: Added some javadoc to Camera.takePicture()
Merge commit '7017e0d5c372db1e470d9881c46b15eade051d76'

* commit '7017e0d5c372db1e470d9881c46b15eade051d76':
  Added some javadoc to Camera.takePicture()
2010-07-07 20:55:47 -07:00
Eric Laurent
7385d4c799 am b91881fd: am dacabf97: Merge "Added Visualizer effect." into gingerbread
Merge commit 'b91881fdd1608cc922f105ec552b5505da1fecb9'

* commit 'b91881fdd1608cc922f105ec552b5505da1fecb9':
  Added Visualizer effect.
2010-07-07 20:55:40 -07:00
Jason Sams
3eddc1df3d Merge "Fix image processing resource problem for non high-density devices. Protect include file." 2010-07-07 18:52:21 -07:00
Jason Sams
5e71ef9156 Merge "Add boolean support for setVar." 2010-07-07 18:52:03 -07:00
Fabrice Di Meglio
4ae0f2145b Merge "Fix bug #2779582 (Columns cleanup for the Calendars table)" 2010-07-07 18:46:10 -07:00
Romain Guy
39bdf25342 Merge "Add support to draw 9patches in OpenGL." 2010-07-07 17:57:12 -07:00
Dan Tasse
d4f88f4def am f3f25bf8: Added some javadoc to Camera.takePicture()
Merge commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692' into gingerbread-plus-aosp

* commit 'f3f25bf80b7d21f12442da8f82d17c79dd371692':
  Added some javadoc to Camera.takePicture()
2010-07-07 17:21:46 -07:00
Eric Laurent
37369af6a3 am dacabf97: Merge "Added Visualizer effect." into gingerbread
Merge commit 'dacabf97c609a040ada857a7da6c560097448ae3' into gingerbread-plus-aosp

* commit 'dacabf97c609a040ada857a7da6c560097448ae3':
  Added Visualizer effect.
2010-07-07 16:34:57 -07:00
Eric Laurent
b687191959 Merge "Added Visualizer effect." into gingerbread 2010-07-07 16:23:30 -07:00
Vasu Nori
952872f684 Merge "for WAL to work, can't keep prepared SQL stmt_id in SQLiteStatement" 2010-07-07 15:35:26 -07:00
Romain Guy
d8d357c485 Merge "Simpler way to deal with the FBO multi-cache." 2010-07-07 15:18:33 -07:00
Dirk Dougherty
8ad726395d am 3338775d: am 4b9baa69: am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Merge commit '3338775df7a19e0785c9badcedd90b99cda22013'

* commit '3338775df7a19e0785c9badcedd90b99cda22013':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
2010-07-07 15:11:02 -07:00
Dirk Dougherty
d06d818ef6 am 4b9baa69: am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Merge commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5' into gingerbread-plus-aosp

* commit '4b9baa69f3b3146edbc623f0670103265c4f4fe5':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
2010-07-07 15:08:59 -07:00
Dirk Dougherty
d7750ebcb5 am 2651504c: (-s ours) Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Merge commit '2651504c020f07847bafa3d539c36f1396629669' into gingerbread

* commit '2651504c020f07847bafa3d539c36f1396629669':
  Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
2010-07-07 15:06:35 -07:00
James Dong
32ec5e7d15 am b3598832: am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread
Merge commit 'b35988329ac1a574898db9226039e37e352c57a8'

* commit 'b35988329ac1a574898db9226039e37e352c57a8':
  Allow application to set two more encoding paramters: video profile and level
2010-07-07 15:00:28 -07:00
James Dong
6481c7fd2b am 7b3f3048: am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread
Merge commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e'

* commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e':
  Fix some bugs in the MediaProfileReader
2010-07-07 15:00:22 -07:00
Kenny Root
c737a0c929 Merge "Support bidi layout for drawTextOnPath." 2010-07-07 14:59:09 -07:00
James Dong
a3a757588c am c4243342: Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread
Merge commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8' into gingerbread-plus-aosp

* commit 'c42433427a7ed51b5577b2587bf6cb0af903ebf8':
  Allow application to set two more encoding paramters: video profile and level
2010-07-07 14:58:30 -07:00
James Dong
06c6175475 am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread
Merge commit '58c35573cc677b736efefa267eba8727d4411999' into gingerbread-plus-aosp

* commit '58c35573cc677b736efefa267eba8727d4411999':
  Fix some bugs in the MediaProfileReader
2010-07-07 14:58:26 -07:00
James Dong
c54a252c75 Merge "Allow application to set two more encoding paramters: video profile and level" into gingerbread 2010-07-07 14:56:33 -07:00
James Dong
64b99bd495 Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread 2010-07-07 14:56:20 -07:00
Dirk Dougherty
90dc86d7e0 Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo 2010-07-07 14:29:29 -07:00
Vasu Nori
a0c91986e4 Merge "unittests for DatabaseConnectionPool (and fix bugs)" 2010-07-07 14:27:43 -07:00
Andreas Huber
7a727cc8ea am dcf872dc: am c34c8c3f: Merge "Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing." into gingerbrea
Merge commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85'

* commit 'dcf872dcfa6439514c886f8b9bf997beeeb3be85':
  Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.
2010-07-07 14:25:34 -07:00
Andreas Huber
2801326cd3 am c34c8c3f: Merge "Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing." into gingerbread
Merge commit 'c34c8c3fe7fef15b410b0544d5436fcbefccd610' into gingerbread-plus-aosp

* commit 'c34c8c3fe7fef15b410b0544d5436fcbefccd610':
  Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing.
2010-07-07 14:22:39 -07:00
Andreas Huber
3effe3dfc1 Merge "Only send the playback complete notification if a) an error occurred on any track or b) all tracks have finished playing. The previous behaviour was to send the notification as soon as the first track finished playing." into gingerbread 2010-07-07 14:20:15 -07:00
Mathias Agopian
b8c7913306 am 3b09d64a: am ef52b568: Merge "More improvements to the SensorManager documentation" into gingerbread
Merge commit '3b09d64a20732c2f8f65f191899b991417cad51c'

* commit '3b09d64a20732c2f8f65f191899b991417cad51c':
  More improvements to the SensorManager documentation
2010-07-07 13:33:41 -07:00
Romain Guy
aaaf203159 Merge "Optimize FBO cache." 2010-07-07 13:09:09 -07:00
Mathias Agopian
ac825e445b am ef52b568: Merge "More improvements to the SensorManager documentation" into gingerbread
Merge commit 'ef52b5682d8c6ab3a384da5151f0e4dd6e9a5506' into gingerbread-plus-aosp

* commit 'ef52b5682d8c6ab3a384da5151f0e4dd6e9a5506':
  More improvements to the SensorManager documentation
2010-07-07 13:09:07 -07:00
Mathias Agopian
6c9b6b6664 Merge "More improvements to the SensorManager documentation" into gingerbread 2010-07-07 13:06:57 -07:00
Daniel Sandler
57e6720a04 am 0e1d3391: am b59b9445: Fix icon size in intruder alerts.
Merge commit '0e1d3391e3943e695caa0281f4e3374419bb616d'

* commit '0e1d3391e3943e695caa0281f4e3374419bb616d':
  Fix icon size in intruder alerts.
2010-07-07 11:12:27 -07:00
Daniel Sandler
26f14429b2 am b59b9445: Fix icon size in intruder alerts.
Merge commit 'b59b94456b3a8fdfdf524a81274839f657fbb65b' into gingerbread-plus-aosp

* commit 'b59b94456b3a8fdfdf524a81274839f657fbb65b':
  Fix icon size in intruder alerts.
2010-07-07 11:09:57 -07:00
Eric Laurent
873f21c820 Added Visualizer effect.
The visualizer enables application to retrieve part of the currently playing audio for visualization purpose.
It is not an audio recording interface and only returns partial and low quality audio content as a waveform or
a frequency representation (FFT).

Removed temporary hack made in MediaPlayer for animated wall papers based on audio visualization (snoop() method.

This commit also includes a change in AudioEffect class:
 - the enable()/disable() methods have been replaced bya more standard setEnabled() method.
 - some fixes in javadoc

Change-Id: Id092a1340e9e38dae68646ade7be054e3a36980e
2010-07-07 11:00:28 -07:00
Andreas Huber
89d13d3224 am f5b4e342: am 2e6aff8e: Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread
Merge commit 'f5b4e342b581a6e219b49141861b353fb139d00b'

* commit 'f5b4e342b581a6e219b49141861b353fb139d00b':
  ALooperRoster no longer holds strong references to handlers and loopers.
2010-07-07 09:45:38 -07:00
Andreas Huber
7c771fe37f am ff119e74: am 6615defd: Make sure the OMX callback thread is properly shutdown after the node goes away.
Merge commit 'ff119e746afe834040afb1631caee355d94237e8'

* commit 'ff119e746afe834040afb1631caee355d94237e8':
  Make sure the OMX callback thread is properly shutdown after the node goes away.
2010-07-07 09:43:18 -07:00
Andreas Huber
e4ecf0c449 am 2e6aff8e: Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread
Merge commit '2e6aff8e19ce8292a36fe211f8051dccf1fb9670' into gingerbread-plus-aosp

* commit '2e6aff8e19ce8292a36fe211f8051dccf1fb9670':
  ALooperRoster no longer holds strong references to handlers and loopers.
2010-07-07 09:42:59 -07:00
Andreas Huber
2f1276dd22 Merge "ALooperRoster no longer holds strong references to handlers and loopers." into gingerbread 2010-07-07 09:41:05 -07:00
Andreas Huber
4249e205cc am 6615defd: Make sure the OMX callback thread is properly shutdown after the node goes away.
Merge commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd' into gingerbread-plus-aosp

* commit '6615defd4b8ae627e7f0bbb2382c4d86481f76bd':
  Make sure the OMX callback thread is properly shutdown after the node goes away.
2010-07-07 09:40:58 -07:00
Gilles Debunne
7e0b8933e5 Merge "Fixed bug in getTextRunCursor." 2010-07-07 09:40:48 -07:00
Andreas Huber
8b1068c1df am 877045aa: am 9406f626: Merge "An AHandler can now find its associated ALooper." into gingerbread
Merge commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae'

* commit '877045aa853aaf6e58ca3ac7bfa2bde9165b55ae':
  An AHandler can now find its associated ALooper.
2010-07-07 09:15:08 -07:00
Dianne Hackborn
747f65e77a am e24901d3: am 68267415: Add new native Looper API.
Merge commit 'e24901d3adb28fff72821d4e8e2ccc25b2184550'

* commit 'e24901d3adb28fff72821d4e8e2ccc25b2184550':
  Add new native Looper API.
2010-07-07 09:14:57 -07:00
Andreas Huber
b1659c7706 am 9406f626: Merge "An AHandler can now find its associated ALooper." into gingerbread
Merge commit '9406f626b2d8f64a084d41f6ea379e539b162a55' into gingerbread-plus-aosp

* commit '9406f626b2d8f64a084d41f6ea379e539b162a55':
  An AHandler can now find its associated ALooper.
2010-07-07 09:04:26 -07:00
Dianne Hackborn
58eab5f3c4 am 68267415: Add new native Looper API.
Merge commit '682674154e3fe88f6061245145f934f25f1a2eb8' into gingerbread-plus-aosp

* commit '682674154e3fe88f6061245145f934f25f1a2eb8':
  Add new native Looper API.
2010-07-07 09:04:19 -07:00
Maksymilian Osowski
17acd32daa Merge "Basic file filter class for the new DumpRenderTree." 2010-07-07 08:23:28 -07:00