Mathias Agopian
7fe53f9a0d
Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken
2010-05-12 17:35:24 -07:00
Mathias Agopian
d292310655
Merge "remove the "memcpy" hack" into kraken
2010-05-12 17:35:12 -07:00
Mathias Agopian
b5b7f260da
SharedBufferStack now can grow up to 16 buffers.
...
there is a new resize() api, which currently only allows growing.
Change-Id: Ia37b81b73be466d2491ffed7f3a23cd8e113c6fe
2010-05-12 17:28:20 -07:00
Mathias Agopian
d606de6bb6
Refactor some code in surfaceflinger in preparation of upcoming changes
...
the new TextureMagager class now handle texture creation and upload
as well as EGL image creation and binding to GraphicBuffers. This is
used indirectly by Layer and directly by LayerBuffer
the new BufferManager class handles the set of buffers used for a
Layer (Surface), it abstracts how many buffer there is as well as
the use of EGLimage vs. regular texture ops (glTexImage2D).
Change-Id: I2da1ddcf27758e6731400f6cc4e20bef35c0a39a
2010-05-12 17:26:22 -07:00
Costin Manolache
b4490ffd58
Bug 2680071: Rename the Cloud to Device
...
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
2010-05-12 16:16:34 -07:00
Mathias Agopian
89141f9492
remove the "memcpy" hack
...
this hack was used for gpus that don't support cached buffers
for s/w clients. currently we have no gpu with this issue.
this removes quite a bit of complexity.
Change-Id: I72564669f124f92805030e61983711f61c76b6d9
2010-05-12 15:44:26 -07:00
Scott Main
f35cd4d0d1
am 8b518577: am c99c401d: am 38b523af: Merge "docs: add missing path-permissions document" into froyo
2010-05-12 15:37:30 -07:00
Scott Main
9ba4b23da3
am 63768336: am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo
2010-05-12 15:37:27 -07:00
Grace Kloba
61718752ca
am 2fb3b394: am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
2010-05-12 15:37:22 -07:00
Scott Main
0bd38d096b
am c99c401d: am 38b523af: Merge "docs: add missing path-permissions document" into froyo
...
Merge commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265' into kraken
* commit 'c99c401d93f94d4243ed8cdd5fec101efc9ee265':
docs: add missing path-permissions document
2010-05-12 15:35:47 -07:00
Scott Main
d164e9ef78
am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo
...
Merge commit '8b27c965c8a4cb8ceb4b50484d55270758703768' into kraken
* commit '8b27c965c8a4cb8ceb4b50484d55270758703768':
docs: fix broken links
2010-05-12 15:35:41 -07:00
Grace Kloba
2b5146827e
am bfc63c7b: am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
...
Merge commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27' into kraken
* commit 'bfc63c7b83160fd3e771e5187d317348e72d6c27':
The default AlertDialog allows cancel. But the default
2010-05-12 15:35:37 -07:00
Scott Main
a4d5d705ae
am 38b523af: Merge "docs: add missing path-permissions document" into froyo
...
Merge commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp
* commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde':
docs: add missing path-permissions document
2010-05-12 15:33:38 -07:00
Scott Main
d9cb81c4d1
am f0e4ae56: Merge "docs: fix broken links" into froyo
...
Merge commit 'f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp
* commit 'f0e4ae563228db584041d517672aeadacecba61f':
docs: fix broken links
2010-05-12 15:33:35 -07:00
Grace Kloba
7f2992db53
am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.
...
Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp
* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
The default AlertDialog allows cancel. But the default
2010-05-12 15:33:30 -07:00
The Android Open Source Project
9fd187c776
am 1f35de2a: am 79090cb3: merge from open-source master
2010-05-12 15:08:06 -07:00
The Android Open Source Project
400bb7ce30
am 79090cb3: merge from open-source master
...
Merge commit '79090cb3da132d07cd3888ef9242df9872fb4aa1' into kraken
* commit '79090cb3da132d07cd3888ef9242df9872fb4aa1':
Change license for the UUS Information file.
Remove ProximityAlerts Receiver when last ProximityAlert expires.
2010-05-12 15:06:13 -07:00
Scott Main
7a789c8b1a
Merge "docs: add missing path-permissions document" into froyo
2010-05-12 15:01:31 -07:00
The Android Open Source Project
bc4b4efefc
am d6e24ca2: am 4adacd23: merge from open-source master
2010-05-12 14:57:51 -07:00
The Android Open Source Project
ae5c954b68
am 4adacd23: merge from open-source master
...
Merge commit '4adacd23d4c91569b16fe50419f1a91f68d805bd' into kraken
* commit '4adacd23d4c91569b16fe50419f1a91f68d805bd':
Add support for EVDO Rev B
2010-05-12 14:56:00 -07:00
Kenny Root
32953d5b20
am e8621534: Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
2010-05-12 14:55:56 -07:00
Kenny Root
9b7640933e
Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
2010-05-12 14:54:42 -07:00
The Android Open Source Project
7b880ae492
merge from open-source master
...
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
2010-05-12 14:54:38 -07:00
Scott Main
003f8c3ea6
Merge "docs: fix broken links" into froyo
2010-05-12 14:53:35 -07:00
The Android Open Source Project
e0281b61c7
merge from open-source master
...
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
2010-05-12 14:53:25 -07:00
The Android Open Source Project
b744fcaabe
am 2a2174a7: am ccfd99b1: merge from open-source master
2010-05-12 14:44:47 -07:00
The Android Open Source Project
09cb2f6932
am ccfd99b1: merge from open-source master
...
Merge commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614' into kraken
* commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614':
Support for User to User Signaling (UUS)
2010-05-12 14:41:40 -07:00
The Android Open Source Project
327e55780f
merge from open-source master
...
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
2010-05-12 14:39:38 -07:00
The Android Open Source Project
a89b8871f5
am 72a6af1a: am 7d952644: merge from open-source master
2010-05-12 14:14:59 -07:00
The Android Open Source Project
6ddb6ff99e
am 7d952644: merge from open-source master
...
Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken
* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
Support to display message when operation is blocked due to FDN being enabled
2010-05-12 14:12:25 -07:00
The Android Open Source Project
56151325d0
merge from open-source master
...
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
2010-05-12 14:10:23 -07:00
The Android Open Source Project
b3a2e5147e
am 63ece47f: am 2a9ae01f: merge from open-source master
2010-05-12 12:46:17 -07:00
The Android Open Source Project
8dbc266224
am 2a9ae01f: merge from open-source master
...
Merge commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69' into kraken
* commit '2a9ae01f74e7273ce0d1045754597ea78b88ba69':
Corrected repeat count for key repeat in input device.
2010-05-12 12:44:27 -07:00
The Android Open Source Project
049570cbb1
merge from open-source master
...
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
2010-05-12 12:33:35 -07:00
The Android Open Source Project
fc7eccf5fd
am 55bef14f: am fb234bbe: merge from open-source master
2010-05-12 12:15:35 -07:00
The Android Open Source Project
e4582835f0
am fb234bbe: merge from open-source master
...
Merge commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2' into kraken
* commit 'fb234bbe5e7cbae42b4fc8f4ab353ba561599db2':
Notify user regarding invalid number during MO call.
Build software AGL library with correct get_tls() macro for ARMv7 based platforms
Fix glReadPixels() to verify that both x and y are non-negative.
2010-05-12 12:13:18 -07:00
The Android Open Source Project
c77a20a9d6
merge from open-source master
...
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
2010-05-12 11:58:14 -07:00
Dirk Dougherty
0056e5eff5
am e46defea: am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
2010-05-12 11:12:15 -07:00
Dirk Dougherty
8d5b2c4f2f
am 68b37d14: am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
...
Merge commit '68b37d14708414d3cee418024c178f0a3c7d8b5b' into kraken
* commit '68b37d14708414d3cee418024c178f0a3c7d8b5b':
Doc change: remove Google I/O 09 from carousel.
2010-05-12 11:10:10 -07:00
Dirk Dougherty
cd406480fa
am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo
...
Merge commit 'a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp
* commit 'a04202b3258845688bcd8c6208222235569df733':
Doc change: remove Google I/O 09 from carousel.
2010-05-12 11:08:46 -07:00
Dirk Dougherty
5d8d9f1ff1
Merge "Doc change: remove Google I/O 09 from carousel." into froyo
2010-05-12 11:05:03 -07:00
Jean-Michel Trivi
d9ab4e0cef
am afbc5fad: Fix build Remove from API 9 definition the two methods that were removed from API 8.
2010-05-12 10:53:50 -07:00
Scott Main
a338186970
am 1d9b25a0: am 0d967ff0: am 18dc51d4: Merge "docs: fix broken anchor names" into froyo
2010-05-12 08:50:21 -07:00
Dirk Dougherty
bc759a01c7
am dd142ac3: am 052e2102: am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
2010-05-12 08:50:16 -07:00
Dirk Dougherty
8adfe2d295
am a1cdf279: am 89f74cf6: am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo
2010-05-12 08:50:12 -07:00
Scott Main
31806cefd6
am 812266dd: am a250e328: am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo
2010-05-12 08:50:08 -07:00
Brett Chabot
f14282e25b
am 4924ea49: am c8e84e12: am b4c9a8f6: Merge "Fix imf tests." into froyo
2010-05-12 08:49:57 -07:00
Scott Main
f8a36aa6de
am 9809015b: am 21f18e96: am bb129dc5: docs: make Notifying the User an expandable list
2010-05-12 08:49:53 -07:00
Scott Main
59dd4b7d40
am 5b46aa36: am d522b270: am a225e3b1: docs: add quickview box with "see also" links for some articles
2010-05-12 08:49:48 -07:00
Scott Main
2042adc37d
am 1dc7c4ab: am 0130e383: am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo
2010-05-12 08:49:42 -07:00