Romain Guy
27ecb1ab5f
am 8a5f8ba4: Merge "Further reduce the number of GL commands sent to the driver"
...
* commit '8a5f8ba4f3e8352155c711adb649e6f536d194b5':
Further reduce the number of GL commands sent to the driver
2011-12-15 10:07:33 -08:00
Dianne Hackborn
372d1715da
am b5052de7: resolved conflicts for merge of a80bab37 to master
...
* commit 'b5052de75736527549d7e537632777c6fec2e4f0':
Fix issue #5756204 : Crespo IME briefly appears shortened when...
2011-12-15 10:07:25 -08:00
Alex Sakhartchouk
b98f6d3466
Refactoring shader creation.
...
Change-Id: I140aeb0a6a8185441d49b3a1af8144c6a46dd419
2011-12-14 18:09:45 -08:00
Alex Sakhartchouk
18f6419bfe
Adding default scene to assets.
...
Change-Id: Iec48cb53cd5c2902aa64dd02d23724f607f9114c
2011-12-14 17:10:04 -08:00
Alex Sakhartchouk
85d02dc75c
Merge "make loading assets more robust" into graphics-dev
2011-12-14 15:11:14 -08:00
Alex Sakhartchouk
1168868e76
make loading assets more robust
...
Change-Id: I9a2b7be8e8522264f8f2de04b43dbe5ec98bc24a
2011-12-14 15:07:17 -08:00
Romain Guy
8a5f8ba4f3
Merge "Further reduce the number of GL commands sent to the driver"
2011-12-13 17:29:42 -08:00
Alex Sakhartchouk
a74c7ce5bf
Merge "Rename some elements to be more in line with rest of framework." into graphics-dev
2011-12-13 17:11:32 -08:00
Alex Sakhartchouk
684267525b
Rename some elements to be more in line with rest of framework.
...
Change-Id: Icb007bafca9c76959eee2e8134b1d7c592ca885c
2011-12-13 17:02:52 -08:00
Dianne Hackborn
b5052de757
resolved conflicts for merge of a80bab37 to master
...
Change-Id: Id71cc68a617e1ea0dd2f3932d454be6dba336eef
2011-12-13 16:31:43 -08:00
Gilles Debunne
ba711588cd
am 6e87ecbb: am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
...
* commit '6e87ecbb1db883aa60aeb37b059f066974220d2b':
Do not spell check the foreground ExtractEditText.
2011-12-13 16:02:18 -08:00
Gilles Debunne
6e87ecbb1d
am 2450b36a: am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
...
* commit '2450b36a3696bc5afdf2a0f2af8b2008efb8a7b0':
Do not spell check the foreground ExtractEditText.
2011-12-13 15:59:26 -08:00
Fabrice Di Meglio
e9e19a448c
am b5048bce: Merge "TextLayoutCache - fix diacritics composition"
...
* commit 'b5048bceebf1ada63a18fce0b5d9fbe2dd6c0351':
TextLayoutCache - fix diacritics composition
2011-12-13 15:44:30 -08:00
Dianne Hackborn
a80bab372d
am caa8e69a: Merge "Fix issue #5756204 : Crespo IME briefly appears shortened when..." into ics-mr1
...
* commit 'caa8e69a65e15ce2d9e52b18c7caa547eb9a2f48':
Fix issue #5756204 : Crespo IME briefly appears shortened when...
2011-12-13 15:41:54 -08:00
Amith Yamasani
f08f70588c
am 513e14e3: Merge "Dump system and secure settings in bugreport."
...
* commit '513e14e31627430f3198d56a4a9c6336a5a058a6':
Dump system and secure settings in bugreport.
2011-12-13 15:41:51 -08:00
Fabrice Di Meglio
b5048bceeb
Merge "TextLayoutCache - fix diacritics composition"
2011-12-13 15:41:47 -08:00
Dianne Hackborn
caa8e69a65
Merge "Fix issue #5756204 : Crespo IME briefly appears shortened when..." into ics-mr1
2011-12-13 15:40:18 -08:00
Amith Yamasani
513e14e316
Merge "Dump system and secure settings in bugreport."
2011-12-13 15:39:17 -08:00
Gilles Debunne
2450b36a36
am 19636dc4: Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
...
* commit '19636dc4217078a3bfd4b3909b5ac05f8a9aca8f':
Do not spell check the foreground ExtractEditText.
2011-12-13 15:38:43 -08:00
Gilles Debunne
19636dc421
Merge "Do not spell check the foreground ExtractEditText." into ics-mr1
2011-12-13 15:36:48 -08:00
Fabrice Di Meglio
902a5b31c5
TextLayoutCache - fix diacritics composition
...
- normalize (with ICU) each BiDi run before shaping them
We are normalizing by "chuncks" and starting from the end of the string. Each "chunck"
is composed of the main code point and its associated diacritics.
Fix bug #5738435 TextLayoutCache should be able to take care about diacritics during shaping
Change-Id: I7288027a7fa8eafb8b9f38d449625be60214548a
2011-12-13 15:28:16 -08:00
Alex Sakhartchouk
930c941b31
Merge "Properly detecting blending case." into graphics-dev
2011-12-13 15:24:48 -08:00
Alex Sakhartchouk
b6e9dad782
Properly detecting blending case.
...
Change-Id: I9963e50928f17610c509d00780714aea0cb00613
2011-12-13 15:22:34 -08:00
Dianne Hackborn
33b8ee509f
Fix issue #5756204 : Crespo IME briefly appears shortened when...
...
...rotating to landscape
When doing spell checking in the same process as the spell checker, we
need to make sure it is still done asynchronously.
Putting this in I noticed quite a few threading issues in this code, so
I also addressed those (which became very obviously a problem with the
async stuff here now).
Also tweaked the service side to run spell checking at background priority.
Change-Id: I01bafe3bec6bceeca911d6bf2f61a486a2fd4c48
2011-12-13 15:15:33 -08:00
Romain Guy
a1d3c91afb
Further reduce the number of GL commands sent to the driver
...
Change-Id: Id922b2a166ea4573b767c27d3195e11c70320b23
2011-12-13 14:58:14 -08:00
Gilles Debunne
770f0fa92e
Do not spell check the foreground ExtractEditText.
...
Bug 5755099
In extracted text mode, we spell check the background and the foreground
edit text. All changes in the background are already propagated to the
foreground, and updates on the foreground may trigger a spell check
of the entire text since we use setText.
Change-Id: Ie44c3d9113258082ac6df5890851d0e21c702ea2
2011-12-13 14:47:26 -08:00
Chet Haase
5bc5de87f3
am e829bc0f: Merge "Make glyph cache more flexible"
...
* commit 'e829bc0f0364e942bed01536d115a5c08d25d776':
Make glyph cache more flexible
2011-12-13 14:29:06 -08:00
Dianne Hackborn
0457b0a734
am ee4d45f3: am 0be53567: am 19a06fe9: Merge "Fix issue #5755172 : Soft menu key disappears when menu is open" into ics-mr1
...
* commit 'ee4d45f3052c8d339035c4bb8eca9b7a724e5074':
Fix issue #5755172 : Soft menu key disappears when menu is open
2011-12-13 14:29:03 -08:00
Gilles Debunne
b00caf3cad
am 78efa026: am 0d3a5e4c: am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
...
* commit '78efa026c7b5e7bcd06ab1f58ccd024366687cd3':
NPE in GMail / TextLine
2011-12-13 14:29:00 -08:00
Scott Main
be58a958d1
am 09bd7978: am 9a8e7afc: am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
...
* commit '09bd797895a0c549186454f6a0274bc402e95581':
Created Android University lesson for Multiple APKs.
2011-12-13 14:28:51 -08:00
Scott Main
8363ca41b4
am 71786dd1: am 04c6e62c: am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.
...
* commit '71786dd191b899a6121d1a0d2a3a4544db1a91a6':
AndroidU lesson on designing for multiple screens.
2011-12-13 14:28:49 -08:00
Romain Guy
07c04f7755
am 6f2de0a5: Merge "Reduce the number of GL commands generated by the UI"
...
* commit '6f2de0a5d6303ecff2795a94d5051ea0621be07f':
Reduce the number of GL commands generated by the UI
2011-12-13 14:28:46 -08:00
Andreas Huber
59e07a6484
am 17453336: am 22e50edd: (-s ours) am 3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
...
* commit '17453336f4c9ec176ff8a39ab482df0c12e26f63':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
2011-12-13 14:28:34 -08:00
Amith Yamasani
5e96ecc767
am 9413c200: Merge "Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB."
...
* commit '9413c200eb41230ec9bb93f94ee44e09a8b43a7d':
Manual merge: Update VIBRATE_ON to a supported value when upgrading from GB.
2011-12-13 14:28:15 -08:00
Gilles Debunne
b5b1db8a41
am a2ea425f: Merge "Re-synced MR1 and master for SpellChecker"
...
* commit 'a2ea425f2541e25c13034b09e37c8a5e6b255d01':
Re-synced MR1 and master for SpellChecker
2011-12-13 14:28:12 -08:00
Selim Gurun
981646b1c8
am 4f433d53: Merge "Move ssl callbacks to webcore thread."
...
* commit '4f433d53c9cfe850103b33dfbc2a36fa246f8d96':
Move ssl callbacks to webcore thread.
2011-12-13 14:28:09 -08:00
Chet Haase
e829bc0f03
Merge "Make glyph cache more flexible"
2011-12-13 14:03:43 -08:00
Dianne Hackborn
ee4d45f305
am 0be53567: am 19a06fe9: Merge "Fix issue #5755172 : Soft menu key disappears when menu is open" into ics-mr1
...
* commit '0be53567c1c2299c548d3204d2b9240108fbd53a':
Fix issue #5755172 : Soft menu key disappears when menu is open
2011-12-13 13:44:14 -08:00
Dianne Hackborn
0be53567c1
am 19a06fe9: Merge "Fix issue #5755172 : Soft menu key disappears when menu is open" into ics-mr1
...
* commit '19a06fe93cccb4b1dd224b8456969821a19b07ef':
Fix issue #5755172 : Soft menu key disappears when menu is open
2011-12-13 13:42:07 -08:00
Gilles Debunne
78efa026c7
am 0d3a5e4c: am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
...
* commit '0d3a5e4cbddc9a6a0a551698b5152c815842952a':
NPE in GMail / TextLine
2011-12-13 13:42:07 -08:00
Chet Haase
7de0cb12d0
Make glyph cache more flexible
...
Some GPU architectures could not handle the previous implementation
of our glyph cache. Frequent uploads would cause memory problems in the GPU
and eventually a crash due to these memory issues. The solution is to move to
a system of several, smaller caches instead of one monolythic cache for all
glyphs.
Change-Id: I0fc7a323360940d16d5a33eeb33abfab194c5920
2011-12-13 13:41:58 -08:00
Gilles Debunne
0d3a5e4cbd
am 67d54ac0: Merge "NPE in GMail / TextLine" into ics-mr1
...
* commit '67d54ac017494229eed27a184159461d63201a9f':
NPE in GMail / TextLine
2011-12-13 13:40:00 -08:00
Dianne Hackborn
19a06fe93c
Merge "Fix issue #5755172 : Soft menu key disappears when menu is open" into ics-mr1
2011-12-13 13:38:56 -08:00
Gilles Debunne
67d54ac017
Merge "NPE in GMail / TextLine" into ics-mr1
2011-12-13 13:37:29 -08:00
Scott Main
09bd797895
am 9a8e7afc: am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
...
* commit '9a8e7afc53e39e22664c77b3ca6f1a59aac36ee3':
Created Android University lesson for Multiple APKs.
2011-12-13 13:15:27 -08:00
Scott Main
71786dd191
am 04c6e62c: am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.
...
* commit '04c6e62ce4750beb617eb6e4e9cadfd631bfe824':
AndroidU lesson on designing for multiple screens.
2011-12-13 13:15:25 -08:00
Romain Guy
6f2de0a5d6
Merge "Reduce the number of GL commands generated by the UI"
2011-12-13 13:13:31 -08:00
Scott Main
9a8e7afc53
am c9295b20: am fc279e51: Merge "Created Android University lesson for Multiple APKs." into ics-mr0
...
* commit 'c9295b2069af6530fba37a16c88757acaaff63e8':
Created Android University lesson for Multiple APKs.
2011-12-13 13:13:15 -08:00
Scott Main
04c6e62ce4
am 37191e1d: am 801fda54: AndroidU lesson on designing for multiple screens.
...
* commit '37191e1dc783a5558eb8ee4f096bd8350c34415d':
AndroidU lesson on designing for multiple screens.
2011-12-13 13:13:07 -08:00
Romain Guy
15bc6437f8
Reduce the number of GL commands generated by the UI
...
This optimization along with the previous one lets us render an
application like Gmail using only 30% of the number of GL commands
previously required
Change-Id: Ifee63edaf495e04490b5abd5433bb9a07bc327a8
2011-12-13 13:11:32 -08:00