Costin Manolache
9a80b07150
am 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
2010-05-12 19:12:53 -07:00
Costin Manolache
5716a05ecc
am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
2010-05-12 19:11:34 -07:00
Costin Manolache
d4625066eb
am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
...
Merge commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02' into kraken
* commit 'fa2e3dcd855f573e160dbf258fd60a172b6e3f02':
Bug 2680071: Rename the Cloud to Device
2010-05-12 19:10:01 -07:00
Costin Manolache
58ed31eafe
am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo
...
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp
* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
Bug 2680071: Rename the Cloud to Device
2010-05-12 19:06:39 -07:00
Costin Manolache
c7e64a8e4b
Merge "Bug 2680071: Rename the Cloud to Device" into froyo
2010-05-12 19:04:27 -07:00
Mathias Agopian
27e29b6588
am 6b5233de: am 75181b42: another attempt at fixing the build
2010-05-12 18:41:56 -07:00
Mathias Agopian
901fc12fcb
am 75181b42: another attempt at fixing the build
2010-05-12 18:39:33 -07:00
Mathias Agopian
673b56b41f
another attempt at fixing the build
...
Change-Id: I80b498d1bbb8f9ffcec4f27802be7ae9977f70ac
2010-05-12 18:37:43 -07:00
Mathias Agopian
5382f866aa
am fb6bd833: am 7406eafe: should fix the build
2010-05-12 18:31:51 -07:00
Mathias Agopian
20ea16fed5
am 7406eafe: should fix the build
2010-05-12 18:29:34 -07:00
Mathias Agopian
1f9ad95130
am 19f64314: am 2f0e6753: Merge "SharedBufferStack now can grow up to 16 buffers." into kraken
2010-05-12 18:04:39 -07:00
Mathias Agopian
217823a2af
am e0630ae3: am 6a70cb8a: Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken
2010-05-12 18:04:33 -07:00
Mathias Agopian
7423b243be
am 32286409: am ca64ed6a: Merge "remove the "memcpy" hack" into kraken
2010-05-12 18:04:28 -07:00
Konstantin Lopyrev
7fd3c9e50e
Merge "Fix 2673731: Added password history"
2010-05-12 18:01:41 -07:00
Mathias Agopian
9ee9d2dbfa
am 2f0e6753: Merge "SharedBufferStack now can grow up to 16 buffers." into kraken
2010-05-12 17:38:53 -07:00
Mathias Agopian
a1ac870fd1
Merge "SharedBufferStack now can grow up to 16 buffers." into kraken
2010-05-12 17:36:46 -07:00
Mathias Agopian
33d0c08a3b
am 6a70cb8a: Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken
2010-05-12 17:36:27 -07:00
Mathias Agopian
1067eec9d1
am ca64ed6a: Merge "remove the "memcpy" hack" into kraken
2010-05-12 17:36:23 -07:00
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
Romain Guy
20d742c6fe
Merge "Fix dump of the persistent drawing cache attribute."
2010-05-12 15:42:15 -07:00
Scott Main
9e5ff9a3df
am c071591c: am 8b518577: am c99c401d: am 38b523af: Merge "docs: add missing path-permissions document" into froyo
2010-05-12 15:39:34 -07:00
Scott Main
9b3b88aca2
am 9a2a8f06: am 63768336: am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo
2010-05-12 15:39:30 -07:00
Grace Kloba
50a06a103a
am d4ef2973: 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
2010-05-12 15:39: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
ab758122c3
am 35b11843: am 1f35de2a: am 79090cb3: merge from open-source master
2010-05-12 15:25:17 -07:00
The Android Open Source Project
47edf354db
am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master
2010-05-12 15:25:07 -07:00
Kenny Root
d8bf9fd674
am d6effb06: am e8621534: Merge "ZipUtilsRO rewrite based on Dalvik Zip rewrite" into kraken
2010-05-12 15:25:03 -07:00
The Android Open Source Project
2bfc6fb6bc
resolved conflicts for merge of fe953c43 to master
...
Change-Id: Iedf5b55f97f938242e25bcf5098982b2d3e43c68
2010-05-12 15:22:06 -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
