23737 Commits

Author SHA1 Message Date
Kenny Root
dfd550d44c Add @hide tag to fix SDK build
Previous Canvas changes missed a @hide tag, so droiddoc was complaining
about a missing method since that was also hidden.

Change-Id: Ib70a9fa2e20fe32b74ba901bb289e77583164004
2010-05-13 06:21:41 -07:00
Kenny Root
5d8636dbad Merge "Modify Canvas drawText to run bidi and shape." 2010-05-12 19:34:01 -07:00
Costin Manolache
2b6b835196 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
0c6028c10a 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
c195965893 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
fa2e3dcd85 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
8ea9f130d2 Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:04:27 -07:00
Doug Felt
f47d7405bb Modify Canvas drawText to run bidi and shape.
Adds drawTextRun as internal API on Canvas and GraphicsOperations.
Adds implementation to implementors of GraphicsOperations.

Adds state and API on Paint to control the bidi algorithm when used
by Canvas.  This API is currently hidden.

The drawText changes are incomplete since shaping is not yet available
in the native code.

Change-Id: I4368048aef9545df0953a349381771603e04b619
2010-05-12 18:50:02 -07:00
Mathias Agopian
d937420996 am 6b5233de: am 75181b42: another attempt at fixing the build 2010-05-12 18:41:56 -07:00
Mathias Agopian
6b5233dedf am 75181b42: another attempt at fixing the build 2010-05-12 18:39:33 -07:00
Mathias Agopian
75181b42c9 another attempt at fixing the build
Change-Id: I80b498d1bbb8f9ffcec4f27802be7ae9977f70ac
2010-05-12 18:37:43 -07:00
Mathias Agopian
8aa3d7d8a1 am fb6bd833: am 7406eafe: should fix the build 2010-05-12 18:31:51 -07:00
Mathias Agopian
fb6bd833ea am 7406eafe: should fix the build 2010-05-12 18:29:34 -07:00
Mathias Agopian
7406eafe7f should fix the build
Change-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495
2010-05-12 18:26:13 -07:00
Mathias Agopian
b81f6c4c3f 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
55c97878c0 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
74c932d973 am 32286409: am ca64ed6a: Merge "remove the "memcpy" hack" into kraken 2010-05-12 18:04:28 -07:00
Konstantin Lopyrev
0dc407f9a6 Merge "Fix 2673731: Added password history" 2010-05-12 18:01:41 -07:00
Yuncheol Heo
8b70c9c1db Pick the default IME in case of a fresh install.
Bug: 2661261

Change-Id: Id8077ffddd8ddc5c3d3fd371afaad63698ef8d9e
2010-05-13 09:45:27 +09:00
Mathias Agopian
19f64314c6 am 2f0e6753: Merge "SharedBufferStack now can grow up to 16 buffers." into kraken 2010-05-12 17:38:53 -07:00
Mathias Agopian
2f0e6753d6 Merge "SharedBufferStack now can grow up to 16 buffers." into kraken 2010-05-12 17:36:46 -07:00
Mathias Agopian
e0630ae34e 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
32286409cf am ca64ed6a: Merge "remove the "memcpy" hack" into kraken 2010-05-12 17:36:23 -07:00
Mathias Agopian
6a70cb8a38 Merge "Refactor some code in surfaceflinger in preparation of upcoming changes" into kraken 2010-05-12 17:35:24 -07:00
Mathias Agopian
ca64ed6a81 Merge "remove the "memcpy" hack" into kraken 2010-05-12 17:35:12 -07:00
Mathias Agopian
59751dbf7d 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
9f2c4fd9a1 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
Konstantin Lopyrev
863f22d045 Fix 2673731: Added password history
Change-Id: I88919357abea31062caf96b214823b03cbaa15a4
2010-05-12 17:17:53 -07:00
Costin Manolache
8d83f9e31b Bug 2680071: Rename the Cloud to Device
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
2010-05-12 16:16:34 -07:00
Mathias Agopian
aca2ee8a70 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
d4a2fffefd Merge "Fix dump of the persistent drawing cache attribute." 2010-05-12 15:42:15 -07:00
Romain Guy
203688c657 Fix dump of the persistent drawing cache attribute.
Change-Id: I351028f6e0858c9ebf7f59bd6cc964925bc3e2b9
2010-05-12 15:41:32 -07:00
Scott Main
3408c134c0 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
40cc1da0a4 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
f0cec93f69 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
c071591cfd 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
9a2a8f06f5 am 63768336: am 8b27c965: am f0e4ae56: Merge "docs: fix broken links" into froyo 2010-05-12 15:37:27 -07:00
Grace Kloba
d4ef297311 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
8b518577ce 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
6376833687 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
2fb3b394fb 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
c99c401d93 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
8b27c965c8 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
bfc63c7b83 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
f4a1fd1296 am 35b11843: am 1f35de2a: am 79090cb3: merge from open-source master 2010-05-12 15:25:17 -07:00
The Android Open Source Project
381b55863e am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master 2010-05-12 15:25:07 -07:00
Kenny Root
cdcc6a0061 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
8bf05f4742 resolved conflicts for merge of fe953c43 to master
Change-Id: Iedf5b55f97f938242e25bcf5098982b2d3e43c68
2010-05-12 15:22:06 -07:00
The Android Open Source Project
35b1184339 am 1f35de2a: am 79090cb3: merge from open-source master 2010-05-12 15:08:06 -07:00
The Android Open Source Project
1f35de2a2e 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