Commit Graph

30810 Commits

Author SHA1 Message Date
Daniel Sandler
e2b89aca52 Merge "Minor cleanups to Notification docs." 2011-02-23 06:43:12 -08:00
Daniel Sandler
ed9a258e2e Merge "Documentation: Notification.icon is mandatory." 2011-02-23 06:42:48 -08:00
Bjorn Bringert
f69a946209 Merge "ActivityManager exposes launch count API." 2011-02-23 02:30:57 -08:00
Justin Ho
e42b9b6e2f 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
5df01f42df 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
ddaa509ea3 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
1f012c6722 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
8f885718e1 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
cc3e68bff0 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
1ae68dbcb8 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
999df0fb17 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
94d2746f35 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
d5ae8b5426 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
37bf89b5e9 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
0c71423061 am 976a3b4a: am 4d62ef25: docs: revert ndk r6
* commit '976a3b4a96f0f8377614a2870788c49e26580fe5':
  docs: revert ndk r6
2011-02-22 21:40:45 -08:00
Scott Main
10e71d5394 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
bd2312b8b4 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
055dd86efa 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
73cc0bc92b 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
f2676bb083 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
c887d5c2a8 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
3c48c35ec7 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
9427552e6a am ccc802e1: Merge "Support quoted parameters" into gingerbread
* commit 'ccc802e12be64248c2c6822eb36a957435a06ef2':
  Support quoted parameters
2011-02-22 21:18:52 -08:00
Robert Ly
73a8ca392f 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
790827feca 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
2b389b53e8 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
c331cf3a53 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
2c3211a8b9 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
56096b72be 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
075fb8d45d 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
456d1a9e00 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
5c3de225bc am beb01c93: Merge "DO NOT MERGE." into honeycomb
* commit 'beb01c93f9bed3dd36fc8ee63a8a7ab8d6ec9c70':
  DO NOT MERGE.
2011-02-22 21:14:46 -08:00
Scott Main
6dbf9ee57b am 4d62ef25: docs: revert ndk r6
* commit '4d62ef259568a050e0103a9beff702f0edd03f61':
  docs: revert ndk r6
2011-02-22 21:14:40 -08:00
Scott Main
f3ae0bd682 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
c84bd4c4f5 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
Michael I. Gold
3e52713ffd egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-02-22 18:15:08 -08:00
Mathias Agopian
a08ef4932f Remove RefBase.h dependency on TextOutput.h
Change-Id: I72cd6b98ef82b4868fe1c8ec87862cf43fb4ee73
2011-02-22 18:08:58 -08:00
Robert Ly
8a53f66ac7 Merge "doc change: fix missing code ending tag" into honeycomb 2011-02-22 16:57:06 -08:00
James Dong
62021d2145 Merge "Remove mkvparser code from /frameworks/base" 2011-02-22 16:52:12 -08:00
Wink Saville
6432ed33d5 Merge "Add queryFacilityLockForApp and setFacilityLockForApp for v6 ril.h." 2011-02-22 16:51:47 -08:00
Scott Main
1287cd2dc5 Merge "docs: fix broken links" into honeycomb 2011-02-22 16:49:32 -08:00
Stephen Hines
3dc9c966c4 Merge "Fixing incremental build." 2011-02-22 16:45:36 -08:00
Andreas Huber
3bf883b74d Merge "Support for PCMA and PCMU raw audio data in RTP/RTSP." 2011-02-22 16:42:31 -08:00
James Dong
14b4aa8855 Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb 2011-02-22 16:41:29 -08:00
Jeff Brown
a8a8ef41ff Merge "Be more precise about tracking fallback keys." 2011-02-22 16:37:50 -08:00
Kenny Root
27ec88704c Merge "Fix poll options for NativeActivity's hasEvents" 2011-02-22 16:08:42 -08:00
Gilles Debunne
bca8490f60 Merge "Text selection handles correctly scroll" 2011-02-22 15:48:06 -08:00
Scott Main
bc20a560ca Merge "docs: update highlights doc to remove preview" into honeycomb 2011-02-22 15:36:31 -08:00
Scott Main
acc6b035bd Merge "docs: add breadcrumb trails to some docs, mostly manifest docs" into honeycomb 2011-02-22 15:14:39 -08:00
Fabrice Di Meglio
e8e10da2c5 Merge "Code cleaning" 2011-02-22 15:03:24 -08:00