45591 Commits

Author SHA1 Message Date
Irfan Sheriff
563db5343f Merge "Add support for background scanning" 2011-02-23 10:41:12 -08:00
James Dong
afc671fc5e Merge "Application-managed callback buffer support for raw image" 2011-02-23 10:38:21 -08:00
Santosh Madhava
bba9529d79 Merge "Cleanup for issue 3471160 : video editor calls System.gc" 2011-02-23 09:59:07 -08:00
Gloria Wang
87e639bc15 Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data" 2011-02-23 09:58:33 -08:00
Daniel Sandler
282ff9ae3f Fix issues with DND display in status bar.
Bug: 3478116
Bug: 3480339
Change-Id: I513f0c2696dc3fe5aa3a6f071f1e4793f9f9645c
2011-02-23 11:05:37 -05:00
Daniel Sandler
ad788884de Merge "Rotation lock fix for sensor{Landscape,Portrait} activities." 2011-02-23 06:43:16 -08:00
Daniel Sandler
70564141ce Merge "Minor cleanups to Notification docs." 2011-02-23 06:43:12 -08:00
Daniel Sandler
5e98dbc770 Merge "Documentation: Notification.icon is mandatory." 2011-02-23 06:42:48 -08:00
Bjorn Bringert
ceb1997174 Merge "ActivityManager exposes launch count API." 2011-02-23 02:30:57 -08:00
Gloria Wang
d211f41f76 - Add method in MediaPlayerService to collect and pull
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data

Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
2011-02-22 22:42:05 -08:00
Justin Ho
176b8d01b9 am 57b920bd: am da34ab21: am 9208875e: Updated iconography for network status and adding 4G assets
* commit '57b920bd6160663d2a00ea7d8933fcc4c4fd20d1':
  Updated iconography for network status and adding 4G assets
2011-02-22 21:56:27 -08:00
Alon Albert
5df34ac754 am a0946d63: am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit 'a0946d6399431d3cc86ef06d44695251ab04933b':
  Support quoted parameters
2011-02-22 21:56:23 -08:00
Robert Ly
74f0f0e7eb am 190d4e29: am c6c6fe93: Merge "doc change: fix missing code ending tag" into honeycomb
* commit '190d4e29f978742b14e196119e977f0f409b6b86':
  doc change: fix missing code ending tag
2011-02-22 21:41:34 -08:00
Scott Main
72881feb6e am d316bffe: am 47928f89: Merge "docs: fix broken links" into honeycomb
* commit 'd316bffeca451db26fa48d26fa7b10bfd65709c4':
  docs: fix broken links
2011-02-22 21:41:29 -08:00
James Dong
9a146d9d65 am d97c598f: am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit 'd97c598ff4d902583f9083960b088b31350d0018':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:41:25 -08:00
Scott Main
8ce7c32eb0 am 1943b8c8: am 0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb
* commit '1943b8c8da5b03fd97ded8549d16c4db5f116a2d':
  docs: update highlights doc to remove preview
2011-02-22 21:41:20 -08:00
Scott Main
9c979a973d am 8bee4125: am 9d5f35d9: Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb
* commit '8bee41254680493e97c58d4eaa77b5cd112db5ba':
  docs: add breadcrumb trails to some docs, mostly manifest docs
2011-02-22 21:41:14 -08:00
Roman Nurik
001766df60 am 306115b6: am cba8efdf: Add more tags to the RenderScript sample listing.
* commit '306115b617939f7472ce44c216246a367371f991':
  Add more tags to the RenderScript sample listing.
2011-02-22 21:41:09 -08:00
Dirk Dougherty
d073ff58c1 am 30eefe63: am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb
* commit '30eefe6381c54cdbbb473e381c9e1defea76c4d6':
  Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr.
2011-02-22 21:41:03 -08:00
Roman Nurik
1f3e42743e am c49992c9: am 4f4cab75: Merge "Document support for WebM/VP8 decoding." into honeycomb
* commit 'c49992c91ca086fac89310f38a1e66968db34a8a':
  Document support for WebM/VP8 decoding.
2011-02-22 21:40:57 -08:00
Nick Pelly
6189a60216 am 4c9647cf: (-s ours) am beb01c93: Merge "DO NOT MERGE." into honeycomb
* commit '4c9647cf4c01d4b8e0fce693a1b85743d7df8695':
  DO NOT MERGE.
2011-02-22 21:40:51 -08:00
Scott Main
d59408831e am 976a3b4a: am 4d62ef25: docs: revert ndk r6
* commit '976a3b4a96f0f8377614a2870788c49e26580fe5':
  docs: revert ndk r6
2011-02-22 21:40:45 -08:00
Scott Main
456d38c87a am d80d6c52: am f870c5af: docs: add new-child tags to hide the "new" tag when a parent list item is expanded
* commit 'd80d6c52ee2df4bb58fa6a54e5dcfdac005bd424':
  docs: add new-child tags to hide the "new" tag when a parent list item is expanded
2011-02-22 21:40:31 -08:00
Scott Main
1d9c2c758d am bf1f25d8: am 1f694390: docs: move 3.0 optimizing doc into the dev guide
* commit 'bf1f25d888854322d97d9f0981121efea93ea820':
  docs: move 3.0 optimizing doc into the dev guide
2011-02-22 21:40:23 -08:00
Maarten Hooft
fd55bbe0de am 060793ed: (-s ours) am 62f40c8b: (-s ours) am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '060793ed21c6164f74913d4753eba3c46e4e1f3f':
  Import revised translations.  DO NOT MERGE
2011-02-22 21:35:29 -08:00
Romain Guy
e42aa50ded am e5410aa1: am ad492161: am a2090bea: am 7118bdec: Merge "Fix for #12945: ProgressBar.setMax() will always redraw."
* commit 'e5410aa165d2c707c9f31eabbfcf9c2332d9228a':
  Fix for #12945: ProgressBar.setMax() will always redraw.
2011-02-22 21:35:20 -08:00
Justin Ho
57b920bd61 am da34ab21: am 9208875e: Updated iconography for network status and adding 4G assets
* commit 'da34ab214886531e5e9c0d975d0dc70cfe8a26a4':
  Updated iconography for network status and adding 4G assets
2011-02-22 21:23:54 -08:00
Alon Albert
a0946d6399 am 1aba843d: am ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit '1aba843dc327490a749059bcddff90e8048ed75c':
  Support quoted parameters
2011-02-22 21:23:50 -08:00
Justin Ho
da34ab2148 am 9208875e: Updated iconography for network status and adding 4G assets
* commit '9208875e92ec190d49864b92823dd7011b9b443a':
  Updated iconography for network status and adding 4G assets
2011-02-22 21:19:05 -08:00
Alon Albert
1aba843dc3 am ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters
2011-02-22 21:18:52 -08:00
Robert Ly
190d4e29f9 am c6c6fe93: Merge "doc change: fix missing code ending tag" into honeycomb
* commit 'c6c6fe939c83e644b7626f6d3f3be25883af1583':
  doc change: fix missing code ending tag
2011-02-22 21:15:28 -08:00
Scott Main
d316bffeca am 47928f89: Merge "docs: fix broken links" into honeycomb
* commit '47928f898d81625cb1e66eea9eb6120f719e89ee':
  docs: fix broken links
2011-02-22 21:15:23 -08:00
James Dong
d97c598ff4 am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit '6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:15:19 -08:00
Scott Main
1943b8c8da am 0ea4f0d7: Merge "docs: update highlights doc to remove preview" into honeycomb
* commit '0ea4f0d79126e953a87604162c1b9a9e91ffbb1f':
  docs: update highlights doc to remove preview
2011-02-22 21:15:15 -08:00
Scott Main
8bee412546 am 9d5f35d9: Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb
* commit '9d5f35d9e0e406bd9e109879db890e361e137929':
  docs: add breadcrumb trails to some docs, mostly manifest docs
2011-02-22 21:15:09 -08:00
Roman Nurik
306115b617 am cba8efdf: Add more tags to the RenderScript sample listing.
* commit 'cba8efdff8a77b159f259d973b05d508a61206e1':
  Add more tags to the RenderScript sample listing.
2011-02-22 21:15:03 -08:00
Dirk Dougherty
30eefe6381 am 7036d76a: Merge "Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr." into honeycomb
* commit '7036d76a6e172de300c63cb9c33b65a63fe7ce0f':
  Doc change: Add doc for GL texture declaration/filtering, hardwareAccelerated manifest attr.
2011-02-22 21:14:58 -08:00
Roman Nurik
c49992c91c am 4f4cab75: Merge "Document support for WebM/VP8 decoding." into honeycomb
* commit '4f4cab75cc0dff361d181299f07a233e8bb1e1c0':
  Document support for WebM/VP8 decoding.
2011-02-22 21:14:52 -08:00
Nick Pelly
4c9647cf4c am beb01c93: Merge "DO NOT MERGE." into honeycomb
* commit 'beb01c93f9bed3dd36fc8ee63a8a7ab8d6ec9c70':
  DO NOT MERGE.
2011-02-22 21:14:46 -08:00
Scott Main
976a3b4a96 am 4d62ef25: docs: revert ndk r6
* commit '4d62ef259568a050e0103a9beff702f0edd03f61':
  docs: revert ndk r6
2011-02-22 21:14:40 -08:00
Scott Main
d80d6c52ee am f870c5af: docs: add new-child tags to hide the "new" tag when a parent list item is expanded
* commit 'f870c5af7ac45d1c865bb2de5696f45c24ac396d':
  docs: add new-child tags to hide the "new" tag when a parent list item is expanded
2011-02-22 21:14:34 -08:00
Scott Main
bf1f25d888 am 1f694390: docs: move 3.0 optimizing doc into the dev guide
* commit '1f694390225b462f76d580fb150fb0a07585df48':
  docs: move 3.0 optimizing doc into the dev guide
2011-02-22 21:14:15 -08:00
James Dong
e00cab707d Application-managed callback buffer support for raw image
bug - 3292153

Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
2011-02-22 20:48:15 -08:00
Santosh Madhava
3f48207ea4 Cleanup for issue 3471160 : video editor calls System.gc
Change-Id: I8cdebde25a45767a1c1b9b6c2c59b7e65cacc0bd
2011-02-22 20:19:38 -08:00
Mike Lockwood
16dc3073a2 Don't treat WMV and ASF files as video files unless WMV is supported
Change-Id: I512d1db67e06273d9c23d10fa30d2d62f9f75a75
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-22 17:49:00 -08:00
Robert Ly
c6c6fe939c Merge "doc change: fix missing code ending tag" into honeycomb 2011-02-22 16:57:06 -08:00
James Dong
5fb008e380 Merge "Remove mkvparser code from /frameworks/base" 2011-02-22 16:52:12 -08:00
Wink Saville
6bfc2b9346 Merge "Add queryFacilityLockForApp and setFacilityLockForApp for v6 ril.h." 2011-02-22 16:51:47 -08:00
Scott Main
47928f898d Merge "docs: fix broken links" into honeycomb 2011-02-22 16:49:32 -08:00
Stephen Hines
17265b4cce Merge "Fixing incremental build." 2011-02-22 16:45:36 -08:00