2066 Commits

Author SHA1 Message Date
Mathias Agopian
4530a50a7b Merge "New bindings generated by glgen" 2012-07-23 17:59:47 -07:00
Raph Levien
eba77803dc Merge "Hardware implementation of glyph positioning (bug 5443796)" 2012-07-23 17:29:09 -07:00
Thomas Tafertshofer
37c9b49ab5 New bindings generated by glgen
Fixes crash of methods when NULL was used as a
(valid) parameter for a nio.buffer argument.

Bug: 6845189
Change-Id: Iae379d607bbca15d6d23e74e852f94c7f68637f9
2012-07-23 17:09:36 -07:00
Raph Levien
996e57c843 Hardware implementation of glyph positioning (bug 5443796)
This implementation adds a drawGeneralText() method to the OpenGL
Renderer, which supports both a global x, y position, an array of
individual glyph positions, and also a length parameter (which enables
drawing of underline and strikethrough. It also adds the method to the
display list (with marshalling and unmarshalling).

With this change, the existing drawText() method is removed entirely, as
it's subsumed by the new method. It's easy enough to revert to the old
functionality if needed by passing in a NULL positions array.

Change-Id: I8c9e6ce4309fd51cc5511db85df99f6de8f4f6f5
2012-07-23 16:52:20 -07:00
Mathias Agopian
16a4003b11 Merge "updated gles20 bindings, fixes broken methods" 2012-07-23 16:25:33 -07:00
Nick Kralevich
b8acd060d4 am fa6e1ea7: am 2c932143: Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"
* commit 'fa6e1ea773a74aa6a996a783ff16c495ab3cc822':
  s/LOG/ALOG/ in HAVE_SELINUX blocks
2012-07-20 10:00:45 -07:00
Nick Pelly
95f1158908 Introduce SystemClock#elapsedRealtimeNano.
Change-Id: I47e1b14d45c5321f959d46e1805f86aafd72f5d4
2012-07-20 09:51:09 -07:00
Nick Kralevich
fa6e1ea773 am 2c932143: Merge "s/LOG/ALOG/ in HAVE_SELINUX blocks"
* commit '2c932143ffe865d49c741e466b425bdbabbd1f2f':
  s/LOG/ALOG/ in HAVE_SELINUX blocks
2012-07-19 17:14:51 -07:00
Thomas Tafertshofer
dd06946252 updated gles20 bindings, fixes broken methods
this adds correct versions of the broken GLES20 methods
glGetShaderSource, glGetActiveAttrib and glGetActiveUniform.
the old functions are still there and need to be @hide later.

Bug: 6006380
Change-Id: I8127a77c4b89aa8a9a54bea88774077535e2139d
2012-07-19 17:04:47 -07:00
Mathias Agopian
d48a84cea5 Merge "Updated OpenGL bindings to fix nio buffer crash" 2012-07-18 18:31:28 -07:00
Raph Levien
161ebab85d Increase text layout cache size in bytes
The mark positioning changes increase the number of bytes needed per
glyph from 6 to 14. This patch compensates by allocating more total
memory for the text layout cache.

Change-Id: I3cf59547394a41779cf6e92e67688b0fdc85f1a3
2012-07-18 16:16:41 -07:00
Raph Levien
4f3c8f7026 Fix overly verbose logging in TextLayoutCache
I meant to log certain debug values only when DEBUG_GLYPHS was set, but
I used #ifdef instead of #if (when it's not set, it's 0, rather than
undefined).

Change-Id: Ic27fee7dd355009c1873f0a2e12614849bbceebd
2012-07-18 15:40:44 -07:00
Raph Levien
57bdd3d378 Merge "Software-only implementation of glyph positioning (bug 5443796)" 2012-07-18 08:40:19 -07:00
Raph Levien
2301d32f7e Software-only implementation of glyph positioning (bug 5443796)
This patch implements glyph positioning in the Skia-based renderer. Note
that it depends on a fix for bug 6833339 being in place (correct
calculation of advance widths under skew and scale transforms),
otherwise there will be regressions.

Careful attention was paid to correct results in a wide variety of
conditions: alignments, text decorations, scale, skew, etc. Many of
these are exercised in the test app attached to bug 6833339.

Note that this patch also changes slightly the way that the total
advance is calculated - the running is accumulated and passed through to
computeRunValues(), so that the x positions of each glyph can be set
according to the total advance of all glyphs (in all runs) appearing
before (plus, of course, the offset for mark positioning).

After committing this patch, text rendering will no longer match between
the software and hardware rendering cases. Implementing positioning in
the hardware renderer will resolve that, and fully implement bug 5443796.

Change-Id: Ie0f7835d48bc120475a19afbfe159aa5304fcaa8
2012-07-17 18:11:28 -07:00
Matthew Xie
a0a69897df Merge "Remove BT references from System Server." 2012-07-16 21:13:06 -07:00
Matthew Xie
d4d4e715c5 Merge "Delete various Bluetooth files for stack integration." 2012-07-16 21:09:13 -07:00
Jeff Brown
ef4e817ad6 Remove freeze(), unfreeze() and setFreezeTint().
This is all dead code.

Change-Id: Ia8a3068606bfe277a16cde5690f47996657863e8
2012-07-16 15:02:49 -07:00
Jeff Brown
55e395ab33 Remove freezeDisplay(), which is no-op.
Change-Id: I981ee49e6e2d41a09feaee4b384392e83f7faf3d
2012-07-16 14:57:22 -07:00
Jaikumar Ganesh
3419618736 Remove BT references from System Server.
Change-Id: Icfdb3e140aa35174a8b70da57472a1bf2bd0143b

Conflicts:

	services/java/com/android/server/SystemServer.java
2012-07-13 22:22:51 -07:00
Jaikumar Ganesh
313a216709 Delete various Bluetooth files for stack integration. 2012-07-13 22:22:51 -07:00
Thomas Tafertshofer
17045a1657 Updated OpenGL bindings to fix nio buffer crash
Contains the updated OpenGL bindings generated by glgen.
Fixes a bug with methods that have more then one nio buffer argument.

Bug: 6772416
Change-Id: I6d50ce79669edd43dbe414e499660cdd55eb4893
2012-07-12 13:55:55 -07:00
Romain Guy
f0af1d5cb2 Remove unused View.flushLayer() API
Change-Id: I5d4c7388afb5265964ab6b769cc0abfee9745c84
2012-07-11 18:31:21 -07:00
Romain Guy
4c9dfc4da9 Merge "Update layers' opaque property when needed" 2012-07-11 17:48:34 -07:00
Romain Guy
846a533945 Update layers' opaque property when needed
Before this change, changing a View's opacity would not be reflected
by hardware layers. This could cause layers to retain their previous
opacity.

Change-Id: Iba2c8b4242deca021651df9324cc7c585a64653d
2012-07-11 17:44:57 -07:00
Mathias Agopian
f16336790b Merge "Fixed exception caused crash in GL bindings" 2012-07-11 16:08:25 -07:00
Mathias Agopian
73a3c0c4d7 Merge "EGL 1.4 bindings generated by glgen" 2012-07-11 16:08:18 -07:00
Victoria Lease
cae28fa051 Merge "Remove hardcoded typeface pointers" 2012-07-11 12:49:12 -07:00
Billy Hewlett
d6deccb346 Remove hardcoded typeface pointers
There were a number of extraneous typeface pointers, one per
language, in TextLayoutCache.  Removing these makes adding additional
supported fonts easier.  This checkin now properly
unrefs typefaces returned by SkCreateTypefaceForScript.  Additionally,
all harfbuzz shaped fonts (with exceptions Greek, Cyrillic, Hangul)
should call SkCreateTypefaceForScript.

Change-Id: I7dcf603a89e5ff52c6dab8fb87ae1807a79c351c
2012-07-11 08:55:59 -07:00
Thomas Tafertshofer
6b1e838fc1 EGL 1.4 bindings generated by glgen
Change-Id: I1c3da57101f4ea089a12f1796f25b72d6852141e
2012-07-10 15:48:30 -07:00
Romain Guy
6d2999a048 am 90752485: Properly resize paletted bitmaps when adjusting for density
* commit '907524851af0d656ba049311f7535a4ba5d2b1d2':
  Properly resize paletted bitmaps when adjusting for density
2012-07-10 13:26:49 -07:00
Romain Guy
907524851a Properly resize paletted bitmaps when adjusting for density
If an app used a GIF file in the wrong density bucket, the auto-scaling
code would not properly resize the bitmap.

This issue affects third party applications, here is the external bug
report:

http://code.google.com/p/android/issues/detail?id=34619

DO NOT MERGE

Change-Id: I7f99b28ad6e6c28bdbcb29bbbadcb215268ff710
2012-07-10 13:16:46 -07:00
Romain Guy
053a82cc18 Properly resize paletted bitmaps when adjusting for density
If an app used a GIF file in the wrong density bucket, the auto-scaling
code would not properly resize the bitmap.

Change-Id: I28f6506a94b20d11b3ba53ac442abec2b92e093e
2012-07-10 12:02:33 -07:00
Joshua Brindle
365861e3aa s/LOG/ALOG/ in HAVE_SELINUX blocks
The latest push changed LOG(E|V) to ALOG(E|V) but it was not updated in HAVE_SELINUX blocks.

Change-Id: I626588589dd00775ba29f2a256ac29e481598dc3
Signed-off-by: Joshua Brindle <jbrindle@tresys.com>
2012-07-10 11:02:01 -04:00
Glenn Kasten
845b4712f0 Use audio_channel_mask_t more consistently
In AudioRecord::getMinFrameCount() and AudioSystem::getInputBufferSize(),
input parameter is channel mask instead of channel count.

Change-Id: I22a1c492113f3e689173c5ab97b2567cff3abe2b
2012-07-03 08:40:46 -07:00
Thomas Tafertshofer
2545b32ced Fixed exception caused crash in GL bindings
Bug: 6709865
Change-Id: Iab55a9eda2ec686710872abf0ff2ebbdf382f77c
2012-06-27 16:42:13 -07:00
Raph Levien
f62034d896 Initialize shaper offset array. Needed for bug 5443796.
Harfbuzz apparently requires the offset array to be initialized to zero,
otherwise it can report corrupt glyph positions. This change also
contains a small amount of refactoring to avoid code duplication.

Change-Id: I2553974f40bc8e0549876c7d31243960ca92a8a2
2012-06-26 08:59:17 -07:00
Raph Levien
6212a4f2ed Fix broken build when DEBUG_GLYPHS is set
Some of the logging lines referred to the "path" variable which no
longer exists. We log the Harfbuzz script instead, which hopefully
provides enough context.

This change only affects debug builds, but we will want to be working
intensively in this space.

Change-Id: I86c3b58c9fa2a8c47812ef5f0b5ce64fd8dcdc20
2012-06-25 14:29:52 -07:00
Glenn Kasten
10a9831b66 Remove AudioRecord record_flags
Change-Id: I8a3d62ea64415582c87f43e94b17aa884d7d572d
2012-06-22 13:49:38 -07:00
Billy Hewlett
960511848a Revert "Revert "Use Elegant fonts for Webkit, Compact fonts for Textview""
This reverts commit 6fadccd2484233ed570218b3f97c085ef1a1ec28
2012-06-21 09:58:42 -07:00
Billy Hewlett
6fadccd248 Revert "Use Elegant fonts for Webkit, Compact fonts for Textview"
This reverts commit ecf80965d05e44b3701b3392aeb02028daacf1b0
2012-06-21 09:45:30 -07:00
Billy Hewlett
ecf80965d0 Use Elegant fonts for Webkit, Compact fonts for Textview
Fonts can be marked with elegant or compact in fallback_fonts.xml.
Webkit uses elegant fonts, Textview uses compact fonts (the default),
unmarked fonts are used by both.

    Bug: 6649136

Change-Id: Ie0debcddc13350bf60fe3139cd7ae533e466f02b
2012-06-20 09:07:09 -07:00
Raph Levien
e25071650e Fix bug 6688060: breakage in AndroidCharacter.mirror
A code cleanup inadvertently changed the semantics of the function,
causing it to return immediately when the first character is mirrored.
This causes CTS test breakage (in
android.text.cts.AndroidCharacterTest). This change restores the earlier
behavior and causes the test to pass.

Change-Id: I68cfb75f1db16eaa72e569dc48fbd0dee06f2de8
2012-06-18 16:17:30 -07:00
Matthew Xie
3199209c92 am 8607127d: am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev
* commit '8607127d8bd9bf87cce9dde5451c926a14548bfd':
  Handle ENITR failure for Headset control channel.
2012-06-14 20:33:56 -07:00
Matthew Xie
8607127d8b am 839734bb: Merge "Handle ENITR failure for Headset control channel." into jb-dev
* commit '839734bbe502c876237a0473823b606803051825':
  Handle ENITR failure for Headset control channel.
2012-06-14 20:31:15 -07:00
Matthew Xie
be513afb62 Handle ENITR failure for Headset control channel.
Wrap poll and read with TEMP_FAILURE_RETRY
bug 6503000, 6623444

Change-Id: I2e302dc04df6b5bd5982c3d189881a687a95fb2d
2012-06-14 20:08:40 -07:00
Jeff Brown
f69eef1b63 am b8b29fa7: am fdcac45b: Merge "Print extended SQLite error code." into jb-dev
* commit 'b8b29fa7f18dd36bacc97d6c471935cb95e4c18c':
  Print extended SQLite error code.
2012-06-12 16:13:41 -07:00
Jeff Brown
b8b29fa7f1 am fdcac45b: Merge "Print extended SQLite error code." into jb-dev
* commit 'fdcac45b6767caaac70c30fd974dce61119f79d7':
  Print extended SQLite error code.
2012-06-12 16:09:34 -07:00
Jeff Brown
ca309f212d Print extended SQLite error code.
Bug: 6538393
Change-Id: I2b010c6a1127887717af67ec588c3df8bf41afe6
2012-06-12 15:39:09 -07:00
Dianne Hackborn
be782a6aa0 am 3857681e: am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev
* commit '3857681e5885b64e593dcc3e28492b156d860ed3':
  Include important native processes in watchdog stacks.
2012-06-11 10:44:52 -07:00
Dianne Hackborn
3857681e58 am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev
* commit 'a7e3a1e0e7d308e7e78a1992038a34485d04ab29':
  Include important native processes in watchdog stacks.
2012-06-11 10:41:09 -07:00