Romain Guy
62d59ed785
am a4ed1c67: am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread
...
Merge commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac'
* commit 'a4ed1c6788ead0324106d76f497233ee42a1f1ac':
fix [2912927] Can't get NV_draw_path extension to work
2010-08-16 07:49:24 -07:00
Jean-Baptiste Queru
8a3c61d5a3
am 73815413: Ignore 87624778
...
Merge commit '7381541309d515f780879d23857675c9c8ee9344'
* commit '7381541309d515f780879d23857675c9c8ee9344':
DO NOT MERGE WLAN: Reset power save mode to startup value after DHCP response.
2010-08-16 07:49:13 -07:00
Erik Gilling
29bd2fadbf
am 122f14fa: am 94364b91: surfaceflinger: don\'t check HWComposer numLayers unless one exists
...
Merge commit '122f14fa7d0ac4d7a62757f596431286f6ab037f'
* commit '122f14fa7d0ac4d7a62757f596431286f6ab037f':
surfaceflinger: don't check HWComposer numLayers unless one exists
2010-08-16 07:45:00 -07:00
Wink Saville
a67b3edfd3
Merge "Add documentation to NetworkStateTracker and a small change to the API."
2010-08-14 09:29:21 -07:00
Eric Laurent
2c591a867e
am f28608cd: am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
...
Merge commit 'f28608cdf4f6a0075d0811ccd32123baf4daec31'
* commit 'f28608cdf4f6a0075d0811ccd32123baf4daec31':
Fix issue 2909189: System property ro.audio.silent no longer mutes system.
2010-08-13 17:23:53 -07:00
Daniel Lehmann
5b51d2bf4d
Merge "Reran update-api"
2010-08-13 16:22:43 -07:00
Dianne Hackborn
e32844a6d4
Merge "Fix bug with calls to the typeless open API."
2010-08-13 16:08:08 -07:00
Gilles Debunne
8e9a7be4b8
Merge "Changed default background colors to new UI style."
2010-08-13 15:50:38 -07:00
Alex Sakhartchouk
b3ca75f03d
Merge "Adding bounding box computation."
2010-08-13 14:39:01 -07:00
Romain Guy
5e1bf8d4fa
am 1e4aa48c: Merge "fix [2912927] Can\'t get NV_draw_path extension to work" into gingerbread
...
Merge commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661' into gingerbread-plus-aosp
* commit '1e4aa48cfd2b2c13c4f7ace8c9fcb33adfa18661':
fix [2912927] Can't get NV_draw_path extension to work
2010-08-13 14:27:36 -07:00
Jean-Baptiste Queru
024c8705bb
Ignore 87624778
...
It already exists in this branch
Change-Id: Ic4329e543d34828f41040dc264260be9d03a20e7
2010-08-13 14:24:06 -07:00
Romain Guy
f285cb0975
Merge "fix [2912927] Can't get NV_draw_path extension to work" into gingerbread
2010-08-13 14:18:55 -07:00
Mathias Agopian
4a88b52235
fix [2912927] Can't get NV_draw_path extension to work
...
there was a problem with eglGetProcAddress() which would only work with
GLES 1.x contexts.
Change-Id: I4747671cbf7ed469bb471a377f1d6f36550d24df
2010-08-13 14:17:58 -07:00
Shimeng (Simon) Wang
de57007c48
Merge "Change scale for large screen reading when double tapped."
2010-08-13 13:56:42 -07:00
Adam Cohen
8e40cbbaff
Merge "-> Refactored and cleaned up dragging / animations -> Added methods to generate blue glow outline -> Added "res-out" effect -> Added some influence for dragging left / right"
2010-08-13 13:50:31 -07:00
Daisuke Miyakawa
dff83c9a29
Merge "Make the doc for PreferenceScreen aware of PreferenceFragment."
2010-08-13 13:42:56 -07:00
Adam Powell
2d68b9a4db
Merge "Clean up some Action Bar style handling."
2010-08-13 13:42:32 -07:00
Daniel Sandler
b9619bde27
Merge "Battery meter now functioning in the system bar and settings panel."
2010-08-13 12:06:06 -07:00
Dmitri Plotnikov
532a4ea861
Merge "Keep the '+' when normalizing the phone number"
2010-08-13 11:38:06 -07:00
Alex Sakhartchouk
0f144f37c9
Merge "Renderscript scenegraph prototype."
2010-08-13 10:45:48 -07:00
Maksymilian Osowski
c7d426f732
Merge "Added copyright information to the files that were missing it."
2010-08-13 10:23:52 -07:00
Erik Gilling
38af31e3e2
am 94364b91: surfaceflinger: don\'t check HWComposer numLayers unless one exists
...
Merge commit '94364b91a2894bf037b8beb027132fbb812e1434' into gingerbread-plus-aosp
* commit '94364b91a2894bf037b8beb027132fbb812e1434':
surfaceflinger: don't check HWComposer numLayers unless one exists
2010-08-13 10:13:39 -07:00
Erik Gilling
ae95765868
surfaceflinger: don't check HWComposer numLayers unless one exists
...
Change-Id: I4b83f7bf7ba1318c70054117f14e759fe0ad105c
2010-08-13 10:10:48 -07:00
Eric Laurent
2642e5b29f
am c8d0d630: Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
...
Merge commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a' into gingerbread-plus-aosp
* commit 'c8d0d6307fc5cdd24083113456ac33790a5fb94a':
Fix issue 2909189: System property ro.audio.silent no longer mutes system.
2010-08-13 08:06:23 -07:00
Eric Laurent
a54831c55e
Merge "Fix issue 2909189: System property ro.audio.silent no longer mutes system." into gingerbread
2010-08-13 08:00:14 -07:00
Ben Murdoch
2d6f7c251e
Merge "Merge WebKit at r65072 : Update DRT ignore list."
2010-08-13 05:20:08 -07:00
Ben Murdoch
b7f4491c23
Merge "Merge WebKit at r65072 : Update User Agent string with new webkit version."
2010-08-13 05:19:53 -07:00
Maksymilian Osowski
19713a66d6
Merge "Added python script that starts/stops apache2 server on host machine configured to handle http layout tests."
2010-08-13 05:18:20 -07:00
Erik Gilling
24925bfba2
surfaceflinger: don't check HWComposer numLayers unless one exists
...
Change-Id: I6524f46910b761cff3ef696edf5a65a424879faa
2010-08-12 23:21:40 -07:00
Dmitri Plotnikov
907ba86908
Merge "Adding query-based aggregation suggestions"
2010-08-12 18:35:28 -07:00
John Wang
cbcb50529c
am 2835391c: am 686a9505: Merge "Update switch call and accept call." into gingerbread
...
Merge commit '2835391c1709a2b655940200dab0fc74ef08512d'
* commit '2835391c1709a2b655940200dab0fc74ef08512d':
Update switch call and accept call.
2010-08-12 17:35:53 -07:00
John Wang
fcf5b9c268
am 686a9505: Merge "Update switch call and accept call." into gingerbread
...
Merge commit '686a95055896c221c62fe7f4c3dda137809df91e' into gingerbread-plus-aosp
* commit '686a95055896c221c62fe7f4c3dda137809df91e':
Update switch call and accept call.
2010-08-12 17:33:19 -07:00
John Wang
dd978e3337
Merge "Update switch call and accept call." into gingerbread
2010-08-12 17:30:38 -07:00
James Dong
f6f994f4a7
am 38a9f405: am e95d192f: Mainly fix two mistakes that I made:
...
Merge commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f'
* commit '38a9f4050ac4b299c459e25bfff6b852bc8de54f':
Mainly fix two mistakes that I made:
2010-08-12 17:05:28 -07:00
Jason Sams
82bb4e190c
Merge "Start adding RS tests."
2010-08-12 17:03:47 -07:00
James Dong
42d9c1bdb8
am e95d192f: Mainly fix two mistakes that I made:
...
Merge commit 'e95d192fae5a80ed821c53bfea214a85ea395e90' into gingerbread-plus-aosp
* commit 'e95d192fae5a80ed821c53bfea214a85ea395e90':
Mainly fix two mistakes that I made:
2010-08-12 17:02:42 -07:00
Jason Sams
f5d1a60583
Merge "Thread launch strategies."
2010-08-12 16:59:18 -07:00
Mike Dodd
4a7c9e05fd
am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
...
Merge commit '2f02044944d5c526020d4e8cceaae7e77382d56d'
* commit '2f02044944d5c526020d4e8cceaae7e77382d56d':
Support getting codec, width, and height in URL for gtalk playback.
2010-08-12 16:50:39 -07:00
Eric Fischer
2460342962
Merge "Import revised translations."
2010-08-12 16:48:41 -07:00
Mike Dodd
3cae496ccb
am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
...
Merge commit '5f96138ba65cecf38d0c752d87ad47d931db8775' into gingerbread-plus-aosp
* commit '5f96138ba65cecf38d0c752d87ad47d931db8775':
Support getting codec, width, and height in URL for gtalk playback.
2010-08-12 16:47:52 -07:00
Mike Dodd
d98ac85c79
Merge "Support getting codec, width, and height in URL for gtalk playback." into gingerbread
2010-08-12 16:45:19 -07:00
Andreas Huber
113080a83c
am 73af0a92: am 72ac1f26: Fix software avc encoder crash at EOS.
...
Merge commit '73af0a9211d0c4be663d287cefd9bf35746db1ba'
* commit '73af0a9211d0c4be663d287cefd9bf35746db1ba':
Fix software avc encoder crash at EOS.
2010-08-12 16:20:56 -07:00
Andreas Huber
06e7165194
am 72ac1f26: Fix software avc encoder crash at EOS.
...
Merge commit '72ac1f26d73bd8e7645365d8d8374fac7a511263' into gingerbread-plus-aosp
* commit '72ac1f26d73bd8e7645365d8d8374fac7a511263':
Fix software avc encoder crash at EOS.
2010-08-12 16:18:19 -07:00
Romain Guy
95f7794652
Merge "Fix GC issue, fix local shader transformations."
2010-08-12 15:37:33 -07:00
Mathias Agopian
411df88007
am 1f432b19: am b7d1be01: Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread
...
Merge commit '1f432b19203b86a2b4da825943024c5b01eaeb60'
* commit '1f432b19203b86a2b4da825943024c5b01eaeb60':
Fix a couple issues with the new hwcomposer HAL
2010-08-12 15:13:13 -07:00
Mathias Agopian
5e9615eaff
am b7d1be01: Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread
...
Merge commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732' into gingerbread-plus-aosp
* commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732':
Fix a couple issues with the new hwcomposer HAL
2010-08-12 15:09:30 -07:00
Adam Powell
69033cd95c
Merge "Cleanup on CL 61012"
2010-08-12 15:08:29 -07:00
Mathias Agopian
72ca07d842
Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread
2010-08-12 15:07:29 -07:00
Mathias Agopian
45721773e1
Fix a couple issues with the new hwcomposer HAL
...
- we now clear the framebuffer upon request from the HAL
- the HAL list size could get out of sync with reality
- there was also an issue where sometime we could run past the list
Change-Id: Ic3a34314aed24181f2d8cc787096af83c046ef27
2010-08-12 15:03:26 -07:00
Trevor Johns
b360e8eb5f
am 1ef758b8: am 404bffbe: am 4f3c5372: Merge "Fix subscribe links for Developer Forums doc." into froyo
...
Merge commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15'
* commit '1ef758b817ba225dbb9005b6def7d8d47ccdfe15':
Fix subscribe links for Developer Forums doc.
2010-08-12 14:36:35 -07:00